Skip to content

C
canifa_note
Commit fafd6d81 authored by johnnyjoy's avatar johnnyjoy
Browse files
Options

chore: fix linter warning

parent be5e24c0
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 11 deletions
server/router/api/v1/memo_service.go
View file @ fafd6d81
...@@ -110,6 +110,13 @@ func (s *APIV1Service) ListMemos(ctx context.Context, request *v1pb.ListMemosReq ...@@ -110,6 +110,13 @@ func (s *APIV1Service) ListMemos(ctx context.Context, request *v1pb.ListMemosReq
memoFind.CreatorID = &userID memoFind.CreatorID = &userID
memoFind.OrderByPinned = true memoFind.OrderByPinned = true
} }
if request.State == v1pb.State_ARCHIVED {
state := store.Archived
memoFind.RowStatus = &state
} else {
state := store.Normal
memoFind.RowStatus = &state
}
if request.Direction == v1pb.Direction_ASC { if request.Direction == v1pb.Direction_ASC {
memoFind.OrderByTimeAsc = true memoFind.OrderByTimeAsc = true
} }
...@@ -123,18 +130,9 @@ func (s *APIV1Service) ListMemos(ctx context.Context, request *v1pb.ListMemosReq ...@@ -123,18 +130,9 @@ func (s *APIV1Service) ListMemos(ctx context.Context, request *v1pb.ListMemosReq
} }
if currentUser == nil { if currentUser == nil {
memoFind.VisibilityList = []store.Visibility{store.Public} memoFind.VisibilityList = []store.Visibility{store.Public}
} else { } else if memoFind.CreatorID == nil || *memoFind.CreatorID != currentUser.ID {
if memoFind.CreatorID == nil || *memoFind.CreatorID != currentUser.ID {
memoFind.VisibilityList = []store.Visibility{store.Public, store.Protected} memoFind.VisibilityList = []store.Visibility{store.Public, store.Protected}
} }
}
if request.State == v1pb.State_ARCHIVED {
state := store.Archived
memoFind.RowStatus = &state
} else {
state := store.Normal
memoFind.RowStatus = &state
}
var limit, offset int var limit, offset int
if request.PageToken != "" { if request.PageToken != "" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment