Skip to content

fix(wopi): use fresh storage mtime for conflict detection and responses#5870

Open
elzody wants to merge 1 commit into
mainfrom
fix/timestamp-version
Open

fix(wopi): use fresh storage mtime for conflict detection and responses#5870
elzody wants to merge 1 commit into
mainfrom
fix/timestamp-version

Conversation

@elzody

@elzody elzody commented Jul 14, 2026

Copy link
Copy Markdown
Collaborator

Resolves:

Target version: main

Summary

Apparently, in some cases when multiple people are editing a document, especially in longer editing sessions, the mtime of the file in the oc_filecache table can become out of sync (behind) what the mtime is on the file storage, leading to a conflict. Re-scanning files on an instance via occ files:scan resolves the conflict as the file cache's mtime is updated to match the storage's.

I have not been able to reproduce the issue, but hopefully reading the mtime from the storage itself helps instead of relying on a potentially outdated one. Additionally, it includes the LastModifiedTime in the conflict dialog.

Assisted-by: ClaudeCode:claude-sonnet-4-6

Checklist

  • Code is properly formatted
  • Sign-off message is added to all commits
  • Documentation (manuals or wiki) has been updated or is not required

Assisted-by: ClaudeCode:claude-sonnet-4-6
Signed-off-by: Elizabeth Danzberger <elizabeth@elzody.dev>
@elzody elzody self-assigned this Jul 14, 2026
@elzody elzody requested a review from juliusknorr as a code owner July 14, 2026 19:35
@elzody elzody added the 3. to review Ready to be reviewed label Jul 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Ready to be reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant