sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10162 from kobergj/DownloadedActivity

Browse Source 
FileDownloaded Activity
This commit is contained in:
kobergj
2024-09-27 10:46:10 +02:00
committed by GitHub
parent 2e107a7c39 a54587e2fd
commit c73d19dacc
5 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog/unreleased/file-downloaded-activity.md
+5
View File
@@ -0,0 +1,5 @@
Enhancement: FileDownloaded Activity
Add an activity when a file gets downloaded via public link
https://github.com/owncloud/ocis/pull/10161
services/activitylog/pkg/command/server.go
+1
View File
@@ -31,6 +31,7 @@ var _registeredEvents = []events.Unmarshaller{
events.UploadReady{}, events.UploadReady{},
events.FileTouched{}, events.FileTouched{},
events.ContainerCreated{}, events.ContainerCreated{},
events.FileDownloaded{},
events.ItemTrashed{}, events.ItemTrashed{},
events.ItemPurged{}, events.ItemPurged{},
events.ItemMoved{}, events.ItemMoved{},
services/activitylog/pkg/service/http.go
+4
View File
@@ -135,6 +135,10 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
message = MessageResourceCreated message = MessageResourceCreated
ts = utils.TSToTime(ev.Timestamp) ts = utils.TSToTime(ev.Timestamp)
vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithUser(ev.Executant, nil, ev.ImpersonatingUser)) vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithUser(ev.Executant, nil, ev.ImpersonatingUser))
case events.FileDownloaded:
message = MessageResourceDownloaded
ts = utils.TSToTime(ev.Timestamp)
vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithUser(ev.Executant, nil, ev.ImpersonatingUser), WithVar("token", "", ev.ImpersonatingUser.GetId().GetOpaqueId()))
case events.ContainerCreated: case events.ContainerCreated:
message = MessageResourceCreated message = MessageResourceCreated
ts = utils.TSToTime(ev.Timestamp) ts = utils.TSToTime(ev.Timestamp)
services/activitylog/pkg/service/response.go
+14 -13
View File
@@ -21,19 +21,20 @@ import (
// Translations // Translations
var ( var (
MessageResourceCreated = l10n.Template("{user} added {resource} to {folder}") MessageResourceCreated = l10n.Template("{user} added {resource} to {folder}")
MessageResourceUpdated = l10n.Template("{user} updated {resource} in {folder}") MessageResourceUpdated = l10n.Template("{user} updated {resource} in {folder}")
MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {folder}") MessageResourceDownloaded = l10n.Template("{resource} was downloaded via public link {token}")
MessageResourceMoved = l10n.Template("{user} moved {resource} to {folder}") MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {folder}")
MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}") MessageResourceMoved = l10n.Template("{user} moved {resource} to {folder}")
MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}") MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}")
MessageShareUpdated = l10n.Template("{user} updated {field} for the {resource}") MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}")
MessageShareDeleted = l10n.Template("{user} removed {sharee} from {resource}") MessageShareUpdated = l10n.Template("{user} updated {field} for the {resource}")
MessageLinkCreated = l10n.Template("{user} shared {resource} via link") MessageShareDeleted = l10n.Template("{user} removed {sharee} from {resource}")
MessageLinkUpdated = l10n.Template("{user} updated {field} for a link {token} on {resource}") MessageLinkCreated = l10n.Template("{user} shared {resource} via link")
MessageLinkDeleted = l10n.Template("{user} removed link to {resource}") MessageLinkUpdated = l10n.Template("{user} updated {field} for a link {token} on {resource}")
MessageSpaceShared = l10n.Template("{user} added {sharee} as member of {space}") MessageLinkDeleted = l10n.Template("{user} removed link to {resource}")
MessageSpaceUnshared = l10n.Template("{user} removed {sharee} from {space}") MessageSpaceShared = l10n.Template("{user} added {sharee} as member of {space}")
MessageSpaceUnshared = l10n.Template("{user} removed {sharee} from {space}")
StrSomeField = l10n.Template("some field") StrSomeField = l10n.Template("some field")
StrPermission = l10n.Template("permission") StrPermission = l10n.Template("permission")
services/activitylog/pkg/service/service.go
+5
View File
@@ -100,6 +100,11 @@ func (a *ActivitylogService) Run() {
err = a.AddActivity(ev.FileRef, e.ID, utils.TSToTime(ev.Timestamp)) err = a.AddActivity(ev.FileRef, e.ID, utils.TSToTime(ev.Timestamp))
case events.FileTouched: case events.FileTouched:
err = a.AddActivity(ev.Ref, e.ID, utils.TSToTime(ev.Timestamp)) err = a.AddActivity(ev.Ref, e.ID, utils.TSToTime(ev.Timestamp))
case events.FileDownloaded:
// we are only interested in public link downloads - so no need to store others.
if ev.ImpersonatingUser.GetDisplayName() == "Public" {
err = a.AddActivity(ev.Ref, e.ID, utils.TSToTime(ev.Timestamp))
}
case events.ContainerCreated: case events.ContainerCreated:
err = a.AddActivity(ev.Ref, e.ID, utils.TSToTime(ev.Timestamp)) err = a.AddActivity(ev.Ref, e.ID, utils.TSToTime(ev.Timestamp))
case events.ItemTrashed: case events.ItemTrashed: