Skip to content

[stable31] Fix public download activity #51704

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
come-nc merged 9 commits into from
Mar 27, 2025
Merged

[stable31] Fix public download activity #51704

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ff8d1e
fix(sharing): Publish activity for download by public link
come-nc Mar 13, 2025
97dbbe4
fix: Fix download activity for folders
come-nc Mar 13, 2025
0c293b3
fix: Avoid triggering several activities for Range request on the sam…
come-nc Mar 13, 2025
d9b2178
fix(files_sharing): Set higher priority for listeners that may abort …
come-nc Mar 13, 2025
8b41055
fix(files_sharing): Use session id as part of cache key to avoid conc…
come-nc Mar 13, 2025
d3b976b
feat: add integration test for sharing activity
come-nc Mar 18, 2025
6923597
feat: Add context and test steps for activity in sharing
come-nc Mar 18, 2025
0742247
fix(sharebymail): Fix activity rich object id type
come-nc Mar 18, 2025
304112b
fix(tests): Sort activities by id to get the last one
come-nc Mar 18, 2025
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
Prev Previous commit
Next Next commit
fix: Avoid triggering several activities for Range request on the sam… 
…e file

Avoids flooding activities when someone browse a video in the web player.

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Mar 27, 2025
commit 0c293b35695848002bd24d1bba10962cbfe5ca3b
12 changes: 10 additions & 2 deletions apps/files_sharing/lib/Listener/BeforeNodeReadListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\ISession;
use OCP\Share\IShare;

/**
Expand All @@ -32,7 +32,7 @@ class BeforeNodeReadListener implements IEventListener {
private ICache $cache;

public function __construct(
private IUserSession $userSession,
private ISession $session,
private IRootFolder $rootFolder,
private \OCP\Activity\IManager $activityManager,
private IRequest $request,
Expand Down Expand Up @@ -113,6 +113,14 @@ public function handleBeforeNodeReadEvent(BeforeNodeReadEvent $event): void {
return;
}

/* Avoid publishing several activities for one video playing */
$cacheKey = $node->getId() . $node->getPath();
if (($this->request->getHeader('range') !== '') && ($this->cache->get($cacheKey) == $this->session->getId())) {
/* This is a range request and an activity for the same file was published in the same session */
return;
}
$this->cache->set($cacheKey, $this->session->getId(), 3600);

$this->singleFileDownloaded($share, $node);
}

Expand Down