mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-22 13:39:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

split events

Browse Source 
Signed-off-by: Christian Richter <crichter@owncloud.com>

# Conflicts:
#	services/activitylog/pkg/service/http.go
#	services/activitylog/pkg/service/response.go

# Conflicts:
#	services/activitylog/pkg/service/response.go
This commit is contained in:
Christian Richter
2024-09-13 12:12:14 +02:00
parent 029ab49e7d
commit a4f67a22a7
2 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/activitylog/pkg/service/http.go
View File

@@ -120,22 +120,35 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
// error already logged in unwrapEvent
continue
case events.UploadReady:
message = MessageResourceCreated
if ev.IsVersion {
message = MessageResourceUpdated
if ev.FileRef.GetPath() == "/" {
message = MessageResourceInSpaceCreated
} else {
message = MessageResourceInFolderCreated
}
ts = utils.TSToTime(ev.Timestamp)
vars, err = s.GetVars(ctx, WithResource(ev.FileRef, true), WithUser(ev.ExecutingUser.GetId(), ev.ExecutingUser.GetDisplayName()), WithSpace(toSpace(ev.FileRef)))
case events.FileTouched:
message = MessageResourceCreated
if ev.Ref.GetPath() == "/" {
message = MessageResourceInSpaceCreated
} else {
message = MessageResourceInFolderCreated
}
ts = utils.TSToTime(ev.Timestamp)
vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref)))
case events.ContainerCreated:
message = MessageResourceCreated
if ev.Ref.GetPath() == "/" {
message = MessageResourceInSpaceCreated
} else {
message = MessageResourceInFolderCreated
}
ts = utils.TSToTime(ev.Timestamp)
vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref)))
case events.ItemTrashed:
message = MessageResourceTrashed
if ev.Ref.GetPath() == "/" {
message = MessageResourceInSpaceTrashed
} else {
message = MessageResourceInFolderTrashed
}
ts = utils.TSToTime(ev.Timestamp)
vars, err = s.GetVars(ctx, WithTrashedResource(ev.Ref, ev.ID), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref)))
case events.ItemMoved:
@@ -144,7 +157,11 @@ func (s *ActivitylogService) HandleGetItemActivities(w http.ResponseWriter, r *h
message = MessageResourceRenamed
vars, err = s.GetVars(ctx, WithResource(ev.Ref, false), WithOldResource(ev.OldReference), WithUser(ev.Executant, ""))
case false:
message = MessageResourceMoved
if ev.Ref.GetPath() == "/" {
message = MessageResourceInSpaceMoved
} else {
message = MessageResourceInFolderMoved
}
vars, err = s.GetVars(ctx, WithResource(ev.Ref, true), WithUser(ev.Executant, ""), WithSpace(toSpace(ev.Ref)))
}
ts = utils.TSToTime(ev.Timestamp)

25
services/activitylog/pkg/service/response.go
View File

@@ -11,7 +11,6 @@ import (
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
"github.com/cs3org/reva/v2/pkg/events"
"github.com/cs3org/reva/v2/pkg/storagespace"
"github.com/cs3org/reva/v2/pkg/utils"
libregraph "github.com/owncloud/libre-graph-api-go"
@@ -21,18 +20,20 @@ import (
// Translations
var (
MessageResourceCreated = l10n.Template("{user} added {resource} to {space}")
MessageResourceUpdated = l10n.Template("{user} updated {resource} in {folder}")
MessageResourceTrashed = l10n.Template("{user} deleted {resource} from {space}")
MessageResourceMoved = l10n.Template("{user} moved {resource} to {space}")
MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}")
MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}")
MessageShareDeleted = l10n.Template("{user} removed {sharee} from {resource}")
MessageLinkCreated = l10n.Template("{user} shared {resource} via link")
MessageResourceInSpaceCreated = l10n.Template("{user} added {resource} to {space}")
MessageResourceInSpaceTrashed = l10n.Template("{user} deleted {resource} from {space}")
MessageResourceInSpaceMoved = l10n.Template("{user} moved {resource} to {space}")
MessageResourceInFolderCreated = l10n.Template("{user} added {resource} to {folder}")
MessageResourceInFolderTrashed = l10n.Template("{user} deleted {resource} from {folder}")
MessageResourceInFolderMoved = l10n.Template("{user} moved {resource} to {folder}")
MessageResourceRenamed = l10n.Template("{user} renamed {oldResource} to {resource}")
MessageShareCreated = l10n.Template("{user} shared {resource} with {sharee}")
MessageShareDeleted = l10n.Template("{user} removed {sharee} from {resource}")
MessageLinkCreated = l10n.Template("{user} shared {resource} via link")
MessageLinkUpdated = l10n.Template("{user} updated {field} for a link {token} on {resource}")
MessageLinkDeleted = l10n.Template("{user} removed link to {resource}")
MessageSpaceShared = l10n.Template("{user} added {sharee} as member of {space}")
MessageSpaceUnshared = l10n.Template("{user} removed {sharee} from {space}")
MessageLinkDeleted = l10n.Template("{user} removed link to {resource}")
MessageSpaceShared = l10n.Template("{user} added {sharee} as member of {space}")
MessageSpaceUnshared = l10n.Template("{user} removed {sharee} from {space}")
)
// GetActivitiesResponse is the response on GET activities requests