Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: update user stats

Johnny7a438be08df9
diff --git a/server/router/api/v1/user_service_stats.go b/server/router/api/v1/user_service_stats.go
index 87055226e..f303dc018 100644
--- a/server/router/api/v1/user_service_stats.go
+++ b/server/router/api/v1/user_service_stats.go
@@ -15,15 +15,6 @@ import (
)
func (s *APIV1Service) ListAllUserStats(ctx context.Context, _ *v1pb.ListAllUserStatsRequest) (*v1pb.ListAllUserStatsResponse, error) {
- currentUser, err := s.GetCurrentUser(ctx)
- if err != nil {
- return nil, status.Errorf(codes.Internal, "failed to get user: %v", err)
- }
- visibilities := []store.Visibility{store.Public}
- if currentUser != nil {
- visibilities = append(visibilities, store.Protected)
- }
-
workspaceMemoRelatedSetting, err := s.Store.GetWorkspaceMemoRelatedSetting(ctx)
if err != nil {
return nil, errors.Wrap(err, "failed to get workspace memo related setting")
@@ -34,9 +25,28 @@ func (s *APIV1Service) ListAllUserStats(ctx context.Context, _ *v1pb.ListAllUser
// Exclude comments by default.
ExcludeComments: true,
ExcludeContent: true,
- VisibilityList: visibilities,
RowStatus: &normalStatus,
}
+
+ currentUser, err := s.GetCurrentUser(ctx)
+ if err != nil {
+ return nil, status.Errorf(codes.Internal, "failed to get user: %v", err)
+ }
+ if currentUser == nil {
+ memoFind.VisibilityList = []store.Visibility{store.Public}
+ } else {
+ if memoFind.CreatorID == nil {
+ internalFilter := fmt.Sprintf(`creator_id == %d || visibility in ["PUBLIC", "Protected"]`, currentUser.ID)
+ if memoFind.Filter != nil {
+ filter := fmt.Sprintf("(%s) && (%s)", *memoFind.Filter, internalFilter)
+ memoFind.Filter = &filter
+ } else {
+ memoFind.Filter = &internalFilter
+ }
+ } else if *memoFind.CreatorID != currentUser.ID {
+ memoFind.VisibilityList = []store.Visibility{store.Public, store.Protected}
+ }
+ }
memos, err := s.Store.ListMemos(ctx, memoFind)
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to list memos: %v", err)