From 33e9b1366538c9f533315b308bc1809b0b83158e Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 1 Apr 2024 00:34:51 +0800 Subject: [PATCH] chore: tweak linter --- server/route/api/v2/inbox_service.go | 16 ++------ .../components/ExploreSidebar/TagsSection.tsx | 38 +++++++++++++++++++ 2 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 web/src/components/ExploreSidebar/TagsSection.tsx diff --git a/server/route/api/v2/inbox_service.go b/server/route/api/v2/inbox_service.go index cfe42713a..a3238e142 100644 --- a/server/route/api/v2/inbox_service.go +++ b/server/route/api/v2/inbox_service.go @@ -30,11 +30,7 @@ func (s *APIV2Service) ListInboxes(ctx context.Context, _ *apiv2pb.ListInboxesRe Inboxes: []*apiv2pb.Inbox{}, } for _, inbox := range inboxes { - inboxMessage, err := s.convertInboxFromStore(ctx, inbox) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to convert inbox from store: %v", err) - } - response.Inboxes = append(response.Inboxes, inboxMessage) + response.Inboxes = append(response.Inboxes, convertInboxFromStore(inbox)) } return response, nil @@ -66,12 +62,8 @@ func (s *APIV2Service) UpdateInbox(ctx context.Context, request *apiv2pb.UpdateI return nil, status.Errorf(codes.Internal, "failed to update inbox: %v", err) } - inboxMessage, err := s.convertInboxFromStore(ctx, inbox) - if err != nil { - return nil, status.Errorf(codes.Internal, "failed to convert inbox from store: %v", err) - } return &apiv2pb.UpdateInboxResponse{ - Inbox: inboxMessage, + Inbox: convertInboxFromStore(inbox), }, nil } @@ -89,7 +81,7 @@ func (s *APIV2Service) DeleteInbox(ctx context.Context, request *apiv2pb.DeleteI return &apiv2pb.DeleteInboxResponse{}, nil } -func (s *APIV2Service) convertInboxFromStore(_ context.Context, inbox *store.Inbox) (*apiv2pb.Inbox, error) { +func convertInboxFromStore(inbox *store.Inbox) *apiv2pb.Inbox { return &apiv2pb.Inbox{ Name: fmt.Sprintf("%s%d", InboxNamePrefix, inbox.ID), Sender: fmt.Sprintf("%s%d", UserNamePrefix, inbox.SenderID), @@ -98,7 +90,7 @@ func (s *APIV2Service) convertInboxFromStore(_ context.Context, inbox *store.Inb CreateTime: timestamppb.New(time.Unix(inbox.CreatedTs, 0)), Type: apiv2pb.Inbox_Type(inbox.Message.Type), ActivityId: inbox.Message.ActivityId, - }, nil + } } func convertInboxStatusFromStore(status store.InboxStatus) apiv2pb.Inbox_Status { diff --git a/web/src/components/ExploreSidebar/TagsSection.tsx b/web/src/components/ExploreSidebar/TagsSection.tsx new file mode 100644 index 000000000..280596c4e --- /dev/null +++ b/web/src/components/ExploreSidebar/TagsSection.tsx @@ -0,0 +1,38 @@ +import { useEffect, useState } from "react"; +import { tagServiceClient } from "@/grpcweb"; +import { Tag } from "@/types/proto/api/v2/tag_service"; +import Icon from "../Icon"; + +const TagsSection = () => { + const [tags, setTags] = useState([]); + + useEffect(() => { + (async () => { + const { tags } = await tagServiceClient.listTags({}); + setTags(tags); + })(); + }, []); + + return ( + tags.length > 0 && ( +
+
+ Tags +
+
+ {tags.map((tag) => ( +
+ + {tag.name} +
+ ))} +
+
+ ) + ); +}; + +export default TagsSection;