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.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: add activity service
Steven79bb3253b6cd
diff --git a/api/v2/activity_service .go b/api/v2/activity_service .gonew file mode 100644index 000000000..62c499016--- /dev/null+++ b/api/v2/activity_service .go@@ -0,0 +1,53 @@+package v2++import (+ "context"+ "time"++ "google.golang.org/grpc/codes"+ "google.golang.org/grpc/status"+ "google.golang.org/protobuf/types/known/timestamppb"++ apiv2pb "github.com/usememos/memos/proto/gen/api/v2"+ storepb "github.com/usememos/memos/proto/gen/store"+ "github.com/usememos/memos/store"+)++func (s *APIV2Service) GetActivity(ctx context.Context, request *apiv2pb.GetActivityRequest) (*apiv2pb.GetActivityResponse, error) {+ activity, err := s.Store.GetActivity(ctx, &store.FindActivity{+ ID: &request.Id,+ })+ if err != nil {+ return nil, status.Errorf(codes.Internal, "failed to get activity: %v", err)+ }++ activityMessage, err := s.convertActivityFromStore(ctx, activity)+ if err != nil {+ return nil, status.Errorf(codes.Internal, "failed to convert activity from store: %v", err)+ }+ return &apiv2pb.GetActivityResponse{+ Activity: activityMessage,+ }, nil+}++func (*APIV2Service) convertActivityFromStore(_ context.Context, activity *store.Activity) (*apiv2pb.Activity, error) {+ return &apiv2pb.Activity{+ Id: activity.ID,+ CreatorId: activity.CreatorID,+ Type: activity.Type.String(),+ Level: activity.Level.String(),+ CreateTime: timestamppb.New(time.Unix(activity.CreatedTs, 0)),+ Payload: convertActivityPayloadFromStore(activity.Payload),+ }, nil+}++func convertActivityPayloadFromStore(payload *storepb.ActivityPayload) *apiv2pb.ActivityPayload {+ v2Payload := &apiv2pb.ActivityPayload{}+ if payload.MemoComment != nil {+ v2Payload.MemoComment = &apiv2pb.ActivityMemoCommentPayload{+ MemoId: payload.MemoComment.MemoId,+ RelatedMemoId: payload.MemoComment.RelatedMemoId,+ }+ }+ return v2Payload+}diff --git a/api/v2/v2.go b/api/v2/v2.goindex d5040bbff..5becfb208 100644--- a/api/v2/v2.go+++ b/api/v2/v2.go@@ -23,6 +23,7 @@ type APIV2Service struct {apiv2pb.UnimplementedResourceServiceServerapiv2pb.UnimplementedTagServiceServerapiv2pb.UnimplementedInboxServiceServer+ apiv2pb.UnimplementedActivityServiceServerSecret stringProfile *profile.Profile@@ -54,6 +55,7 @@ func NewAPIV2Service(secret string, profile *profile.Profile, store *store.Storeapiv2pb.RegisterTagServiceServer(grpcServer, apiv2Service)apiv2pb.RegisterResourceServiceServer(grpcServer, apiv2Service)apiv2pb.RegisterInboxServiceServer(grpcServer, apiv2Service)+ apiv2pb.RegisterActivityServiceServer(grpcServer, apiv2Service)reflection.Register(grpcServer)return apiv2Service@@ -95,6 +97,9 @@ func (s *APIV2Service) RegisterGateway(ctx context.Context, e *echo.Echo) errorif err := apiv2pb.RegisterInboxServiceHandler(context.Background(), gwMux, conn); err != nil {return err}+ if err := apiv2pb.RegisterActivityServiceHandler(context.Background(), gwMux, conn); err != nil {+ return err+ }e.Any("/api/v2/*", echo.WrapHandler(gwMux))// GRPC web proxy.diff --git a/proto/api/v2/activity_service.proto b/proto/api/v2/activity_service.protonew file mode 100644index 000000000..8d7ebb490--- /dev/null+++ b/proto/api/v2/activity_service.proto@@ -0,0 +1,45 @@+syntax = "proto3";++package memos.api.v2;++import "google/api/annotations.proto";+import "google/protobuf/timestamp.proto";++option go_package = "gen/api/v2";++service ActivityService {+ rpc GetActivity(GetActivityRequest) returns (GetActivityResponse) {+ option (google.api.http) = {get: "/v2/activities"};+ }+}++message Activity {+ int32 id = 1;++ int32 creator_id = 2;++ string type = 3;++ string level = 4;++ google.protobuf.Timestamp create_time = 5;++ ActivityPayload payload = 6;+}++message ActivityMemoCommentPayload {+ int32 memo_id = 1;+ int32 related_memo_id = 2;+}++message ActivityPayload {+ ActivityMemoCommentPayload memo_comment = 1;+}++message GetActivityRequest {+ int32 id = 1;+}++message GetActivityResponse {+ Activity activity = 1;+}diff --git a/proto/gen/api/v2/README.md b/proto/gen/api/v2/README.mdindex 66ed6e63f..053082db8 100644--- a/proto/gen/api/v2/README.md+++ b/proto/gen/api/v2/README.md@@ -3,6 +3,15 @@## Table of Contents+- [api/v2/activity_service.proto](#api_v2_activity_service-proto)+ - [Activity](#memos-api-v2-Activity)+ - [ActivityMemoCommentPayload](#memos-api-v2-ActivityMemoCommentPayload)+ - [ActivityPayload](#memos-api-v2-ActivityPayload)+ - [GetActivityRequest](#memos-api-v2-GetActivityRequest)+ - [GetActivityResponse](#memos-api-v2-GetActivityResponse)++ - [ActivityService](#memos-api-v2-ActivityService)+- [api/v2/common.proto](#api_v2_common-proto)- [RowStatus](#memos-api-v2-RowStatus)@@ -94,6 +103,113 @@+<a name="api_v2_activity_service-proto"></a>+<p align="right"><a href="#top">Top</a></p>++## api/v2/activity_service.proto++++<a name="memos-api-v2-Activity"></a>++### Activity++++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| id | [int32](#int32) | | |+| creator_id | [int32](#int32) | | |+| type | [string](#string) | | |+| level | [string](#string) | | |+| create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |+| payload | [ActivityPayload](#memos-api-v2-ActivityPayload) | | |+++++++<a name="memos-api-v2-ActivityMemoCommentPayload"></a>++### ActivityMemoCommentPayload++++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| memo_id | [int32](#int32) | | |+| related_memo_id | [int32](#int32) | | |+++++++<a name="memos-api-v2-ActivityPayload"></a>++### ActivityPayload++++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| memo_comment | [ActivityMemoCommentPayload](#memos-api-v2-ActivityMemoCommentPayload) | | |+++++++<a name="memos-api-v2-GetActivityRequest"></a>++### GetActivityRequest++++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| id | [int32](#int32) | | |+++++++<a name="memos-api-v2-GetActivityResponse"></a>++### GetActivityResponse++++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| activity | [Activity](#memos-api-v2-Activity) | | |+++++++++++++<a name="memos-api-v2-ActivityService"></a>++### ActivityService+++| Method Name | Request Type | Response Type | Description |+| ----------- | ------------ | ------------- | ------------|+| GetActivity | [GetActivityRequest](#memos-api-v2-GetActivityRequest) | [GetActivityResponse](#memos-api-v2-GetActivityResponse) | |+++++<a name="api_v2_common-proto"></a><p align="right"><a href="#top">Top</a></p>diff --git a/proto/gen/api/v2/activity_service.pb.go b/proto/gen/api/v2/activity_service.pb.gonew file mode 100644index 000000000..e4c0af225--- /dev/null+++ b/proto/gen/api/v2/activity_service.pb.go@@ -0,0 +1,492 @@+// Code generated by protoc-gen-go. DO NOT EDIT.+// versions:+// protoc-gen-go v1.31.0+// protoc (unknown)+// source: api/v2/activity_service.proto++package apiv2++import (+ _ "google.golang.org/genproto/googleapis/api/annotations"+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"+ timestamppb "google.golang.org/protobuf/types/known/timestamppb"+ reflect "reflect"+ sync "sync"+)++const (+ // Verify that this generated code is sufficiently up-to-date.+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)+ // Verify that runtime/protoimpl is sufficiently up-to-date.+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)+)++type Activity struct {+ state protoimpl.MessageState+ sizeCache protoimpl.SizeCache+ unknownFields protoimpl.UnknownFields++ Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`+ CreatorId int32 `protobuf:"varint,2,opt,name=creator_id,json=creatorId,proto3" json:"creator_id,omitempty"`+ Type string `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`+ Level string `protobuf:"bytes,4,opt,name=level,proto3" json:"level,omitempty"`+ CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`+ Payload *ActivityPayload `protobuf:"bytes,6,opt,name=payload,proto3" json:"payload,omitempty"`+}++func (x *Activity) Reset() {+ *x = Activity{}+ if protoimpl.UnsafeEnabled {+ mi := &file_api_v2_activity_service_proto_msgTypes[0]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+ }+}++func (x *Activity) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*Activity) ProtoMessage() {}++func (x *Activity) ProtoReflect() protoreflect.Message {+ mi := &file_api_v2_activity_service_proto_msgTypes[0]+ if protoimpl.UnsafeEnabled && x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use Activity.ProtoReflect.Descriptor instead.+func (*Activity) Descriptor() ([]byte, []int) {+ return file_api_v2_activity_service_proto_rawDescGZIP(), []int{0}+}++func (x *Activity) GetId() int32 {+ if x != nil {+ return x.Id+ }+ return 0+}++func (x *Activity) GetCreatorId() int32 {+ if x != nil {+ return x.CreatorId+ }+ return 0+}++func (x *Activity) GetType() string {+ if x != nil {+ return x.Type+ }+ return ""+}++func (x *Activity) GetLevel() string {+ if x != nil {+ return x.Level+ }+ return ""+}++func (x *Activity) GetCreateTime() *timestamppb.Timestamp {+ if x != nil {+ return x.CreateTime+ }+ return nil+}++func (x *Activity) GetPayload() *ActivityPayload {+ if x != nil {+ return x.Payload+ }+ return nil+}++type ActivityMemoCommentPayload struct {+ state protoimpl.MessageState+ sizeCache protoimpl.SizeCache+ unknownFields protoimpl.UnknownFields++ MemoId int32 `protobuf:"varint,1,opt,name=memo_id,json=memoId,proto3" json:"memo_id,omitempty"`+ RelatedMemoId int32 `protobuf:"varint,2,opt,name=related_memo_id,json=relatedMemoId,proto3" json:"related_memo_id,omitempty"`+}++func (x *ActivityMemoCommentPayload) Reset() {+ *x = ActivityMemoCommentPayload{}+ if protoimpl.UnsafeEnabled {+ mi := &file_api_v2_activity_service_proto_msgTypes[1]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+ }+}++func (x *ActivityMemoCommentPayload) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*ActivityMemoCommentPayload) ProtoMessage() {}++func (x *ActivityMemoCommentPayload) ProtoReflect() protoreflect.Message {+ mi := &file_api_v2_activity_service_proto_msgTypes[1]+ if protoimpl.UnsafeEnabled && x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use ActivityMemoCommentPayload.ProtoReflect.Descriptor instead.+func (*ActivityMemoCommentPayload) Descriptor() ([]byte, []int) {+ return file_api_v2_activity_service_proto_rawDescGZIP(), []int{1}+}++func (x *ActivityMemoCommentPayload) GetMemoId() int32 {+ if x != nil {+ return x.MemoId+ }+ return 0+}++func (x *ActivityMemoCommentPayload) GetRelatedMemoId() int32 {+ if x != nil {+ return x.RelatedMemoId+ }+ return 0+}++type ActivityPayload struct {+ state protoimpl.MessageState+ sizeCache protoimpl.SizeCache+ unknownFields protoimpl.UnknownFields++ MemoComment *ActivityMemoCommentPayload `protobuf:"bytes,1,opt,name=memo_comment,json=memoComment,proto3" json:"memo_comment,omitempty"`+}++func (x *ActivityPayload) Reset() {+ *x = ActivityPayload{}+ if protoimpl.UnsafeEnabled {+ mi := &file_api_v2_activity_service_proto_msgTypes[2]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+ }+}++func (x *ActivityPayload) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*ActivityPayload) ProtoMessage() {}++func (x *ActivityPayload) ProtoReflect() protoreflect.Message {+ mi := &file_api_v2_activity_service_proto_msgTypes[2]+ if protoimpl.UnsafeEnabled && x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use ActivityPayload.ProtoReflect.Descriptor instead.+func (*ActivityPayload) Descriptor() ([]byte, []int) {+ return file_api_v2_activity_service_proto_rawDescGZIP(), []int{2}+}++func (x *ActivityPayload) GetMemoComment() *ActivityMemoCommentPayload {+ if x != nil {+ return x.MemoComment+ }+ return nil+}++type GetActivityRequest struct {+ state protoimpl.MessageState+ sizeCache protoimpl.SizeCache+ unknownFields protoimpl.UnknownFields++ Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`+}++func (x *GetActivityRequest) Reset() {+ *x = GetActivityRequest{}+ if protoimpl.UnsafeEnabled {+ mi := &file_api_v2_activity_service_proto_msgTypes[3]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+ }+}++func (x *GetActivityRequest) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*GetActivityRequest) ProtoMessage() {}++func (x *GetActivityRequest) ProtoReflect() protoreflect.Message {+ mi := &file_api_v2_activity_service_proto_msgTypes[3]+ if protoimpl.UnsafeEnabled && x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use GetActivityRequest.ProtoReflect.Descriptor instead.+func (*GetActivityRequest) Descriptor() ([]byte, []int) {+ return file_api_v2_activity_service_proto_rawDescGZIP(), []int{3}+}++func (x *GetActivityRequest) GetId() int32 {+ if x != nil {+ return x.Id+ }+ return 0+}++type GetActivityResponse struct {+ state protoimpl.MessageState+ sizeCache protoimpl.SizeCache+ unknownFields protoimpl.UnknownFields++ Activity *Activity `protobuf:"bytes,1,opt,name=activity,proto3" json:"activity,omitempty"`+}++func (x *GetActivityResponse) Reset() {+ *x = GetActivityResponse{}+ if protoimpl.UnsafeEnabled {+ mi := &file_api_v2_activity_service_proto_msgTypes[4]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+ }+}++func (x *GetActivityResponse) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*GetActivityResponse) ProtoMessage() {}++func (x *GetActivityResponse) ProtoReflect() protoreflect.Message {+ mi := &file_api_v2_activity_service_proto_msgTypes[4]+ if protoimpl.UnsafeEnabled && x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use GetActivityResponse.ProtoReflect.Descriptor instead.+func (*GetActivityResponse) Descriptor() ([]byte, []int) {+ return file_api_v2_activity_service_proto_rawDescGZIP(), []int{4}+}++func (x *GetActivityResponse) GetActivity() *Activity {+ if x != nil {+ return x.Activity+ }+ return nil+}++var File_api_v2_activity_service_proto protoreflect.FileDescriptor++var file_api_v2_activity_service_proto_rawDesc = []byte{+ 0x0a, 0x1d, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,+ 0x79, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,+ 0x0c, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x1a, 0x1c, 0x67,+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61,+ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f,+ 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d,+ 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd9, 0x01, 0x0a,+ 0x08, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x72, 0x65,+ 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63,+ 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65,+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05,+ 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x65, 0x76,+ 0x65, 0x6c, 0x12, 0x3b, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d,+ 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74,+ 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12,+ 0x37, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,+ 0x32, 0x1d, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,+ 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x52,+ 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x5d, 0x0a, 0x1a, 0x41, 0x63, 0x74, 0x69,+ 0x76, 0x69, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x50,+ 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x6f, 0x5f, 0x69,+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x6f, 0x49, 0x64, 0x12,+ 0x26, 0x0a, 0x0f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x5f,+ 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x65,+ 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x49, 0x64, 0x22, 0x5e, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x76,+ 0x69, 0x74, 0x79, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x4b, 0x0a, 0x0c, 0x6d, 0x65,+ 0x6d, 0x6f, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,+ 0x32, 0x28, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,+ 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x6f, 0x43, 0x6f, 0x6d, 0x6d,+ 0x65, 0x6e, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x0b, 0x6d, 0x65, 0x6d, 0x6f,+ 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x24, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x41, 0x63,+ 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a,+ 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x49, 0x0a,+ 0x13, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70,+ 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61,+ 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x08,+ 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x32, 0x7d, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69,+ 0x76, 0x69, 0x74, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6a, 0x0a, 0x0b, 0x47,+ 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x20, 0x2e, 0x6d, 0x65, 0x6d,+ 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74,+ 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x6d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x65, 0x74, 0x41,+ 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,+ 0x16, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x63, 0x74,+ 0x69, 0x76, 0x69, 0x74, 0x69, 0x65, 0x73, 0x42, 0xac, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e,+ 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x42, 0x14, 0x41, 0x63,+ 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f,+ 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,+ 0x2f, 0x75, 0x73, 0x65, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f, 0x6d, 0x65, 0x6d, 0x6f, 0x73, 0x2f,+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x32,+ 0x3b, 0x61, 0x70, 0x69, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x4d, 0x41, 0x58, 0xaa, 0x02, 0x0c, 0x4d,+ 0x65, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x70, 0x69, 0x2e, 0x56, 0x32, 0xca, 0x02, 0x0c, 0x4d, 0x65,+ 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0xe2, 0x02, 0x18, 0x4d, 0x65, 0x6d,+ 0x6f, 0x73, 0x5c, 0x41, 0x70, 0x69, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,+ 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4d, 0x65, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41,+ 0x70, 0x69, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,+}++var (+ file_api_v2_activity_service_proto_rawDescOnce sync.Once+ file_api_v2_activity_service_proto_rawDescData = file_api_v2_activity_service_proto_rawDesc+)++func file_api_v2_activity_service_proto_rawDescGZIP() []byte {+ file_api_v2_activity_service_proto_rawDescOnce.Do(func() {+ file_api_v2_activity_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_api_v2_activity_service_proto_rawDescData)+ })+ return file_api_v2_activity_service_proto_rawDescData+}++var file_api_v2_activity_service_proto_msgTypes = make([]protoimpl.MessageInfo, 5)+var file_api_v2_activity_service_proto_goTypes = []interface{}{+ (*Activity)(nil), // 0: memos.api.v2.Activity+ (*ActivityMemoCommentPayload)(nil), // 1: memos.api.v2.ActivityMemoCommentPayload+ (*ActivityPayload)(nil), // 2: memos.api.v2.ActivityPayload+ (*GetActivityRequest)(nil), // 3: memos.api.v2.GetActivityRequest+ (*GetActivityResponse)(nil), // 4: memos.api.v2.GetActivityResponse+ (*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp+}+var file_api_v2_activity_service_proto_depIdxs = []int32{+ 5, // 0: memos.api.v2.Activity.create_time:type_name -> google.protobuf.Timestamp+ 2, // 1: memos.api.v2.Activity.payload:type_name -> memos.api.v2.ActivityPayload+ 1, // 2: memos.api.v2.ActivityPayload.memo_comment:type_name -> memos.api.v2.ActivityMemoCommentPayload+ 0, // 3: memos.api.v2.GetActivityResponse.activity:type_name -> memos.api.v2.Activity+ 3, // 4: memos.api.v2.ActivityService.GetActivity:input_type -> memos.api.v2.GetActivityRequest+ 4, // 5: memos.api.v2.ActivityService.GetActivity:output_type -> memos.api.v2.GetActivityResponse+ 5, // [5:6] is the sub-list for method output_type+ 4, // [4:5] is the sub-list for method input_type+ 4, // [4:4] is the sub-list for extension type_name+ 4, // [4:4] is the sub-list for extension extendee+ 0, // [0:4] is the sub-list for field type_name+}++func init() { file_api_v2_activity_service_proto_init() }+func file_api_v2_activity_service_proto_init() {+ if File_api_v2_activity_service_proto != nil {+ return+ }+ if !protoimpl.UnsafeEnabled {+ file_api_v2_activity_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {+ switch v := v.(*Activity); i {+ case 0:+ return &v.state+ case 1:+ return &v.sizeCache+ case 2:+ return &v.unknownFields+ default:+ return nil+ }+ }+ file_api_v2_activity_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {+ switch v := v.(*ActivityMemoCommentPayload); i {+ case 0:+ return &v.state+ case 1:+ return &v.sizeCache+ case 2:+ return &v.unknownFields+ default:+ return nil+ }+ }+ file_api_v2_activity_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {+ switch v := v.(*ActivityPayload); i {+ case 0:+ return &v.state+ case 1:+ return &v.sizeCache+ case 2:+ return &v.unknownFields+ default:+ return nil+ }+ }+ file_api_v2_activity_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {+ switch v := v.(*GetActivityRequest); i {+ case 0:+ return &v.state+ case 1:+ return &v.sizeCache+ case 2:+ return &v.unknownFields+ default:+ return nil+ }+ }+ file_api_v2_activity_service_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {+ switch v := v.(*GetActivityResponse); i {+ case 0:+ return &v.state+ case 1:+ return &v.sizeCache+ case 2:+ return &v.unknownFields+ default:+ return nil+ }+ }+ }+ type x struct{}+ out := protoimpl.TypeBuilder{+ File: protoimpl.DescBuilder{+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),+ RawDescriptor: file_api_v2_activity_service_proto_rawDesc,+ NumEnums: 0,+ NumMessages: 5,+ NumExtensions: 0,+ NumServices: 1,+ },+ GoTypes: file_api_v2_activity_service_proto_goTypes,+ DependencyIndexes: file_api_v2_activity_service_proto_depIdxs,+ MessageInfos: file_api_v2_activity_service_proto_msgTypes,+ }.Build()+ File_api_v2_activity_service_proto = out.File+ file_api_v2_activity_service_proto_rawDesc = nil+ file_api_v2_activity_service_proto_goTypes = nil+ file_api_v2_activity_service_proto_depIdxs = nil+}diff --git a/proto/gen/api/v2/activity_service.pb.gw.go b/proto/gen/api/v2/activity_service.pb.gw.gonew file mode 100644index 000000000..381512442--- /dev/null+++ b/proto/gen/api/v2/activity_service.pb.gw.go@@ -0,0 +1,173 @@+// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.+// source: api/v2/activity_service.proto++/*+Package apiv2 is a reverse proxy.++It translates gRPC into RESTful JSON APIs.+*/+package apiv2++import (+ "context"+ "io"+ "net/http"++ "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"+ "github.com/grpc-ecosystem/grpc-gateway/v2/utilities"+ "google.golang.org/grpc"+ "google.golang.org/grpc/codes"+ "google.golang.org/grpc/grpclog"+ "google.golang.org/grpc/metadata"+ "google.golang.org/grpc/status"+ "google.golang.org/protobuf/proto"+)++// Suppress "imported and not used" errors+var _ codes.Code+var _ io.Reader+var _ status.Status+var _ = runtime.String+var _ = utilities.NewDoubleArray+var _ = metadata.Join++var (+ filter_ActivityService_GetActivity_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}+)++func request_ActivityService_GetActivity_0(ctx context.Context, marshaler runtime.Marshaler, client ActivityServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var protoReq GetActivityRequest+ var metadata runtime.ServerMetadata++ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ActivityService_GetActivity_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }++ msg, err := client.GetActivity(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))+ return msg, metadata, err++}++func local_request_ActivityService_GetActivity_0(ctx context.Context, marshaler runtime.Marshaler, server ActivityServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {+ var protoReq GetActivityRequest+ var metadata runtime.ServerMetadata++ if err := req.ParseForm(); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }+ if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_ActivityService_GetActivity_0); err != nil {+ return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)+ }++ msg, err := server.GetActivity(ctx, &protoReq)+ return msg, metadata, err++}++// RegisterActivityServiceHandlerServer registers the http handlers for service ActivityService to "mux".+// UnaryRPC :call ActivityServiceServer directly.+// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.+// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterActivityServiceHandlerFromEndpoint instead.+func RegisterActivityServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ActivityServiceServer) error {++ mux.Handle("GET", pattern_ActivityService_GetActivity_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ var stream runtime.ServerTransportStream+ ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ var err error+ var annotatedContext context.Context+ annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v2.ActivityService/GetActivity", runtime.WithHTTPPathPattern("/v2/activities"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := local_request_ActivityService_GetActivity_0(annotatedContext, inboundMarshaler, server, req, pathParams)+ md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }++ forward_ActivityService_GetActivity_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)++ })++ return nil+}++// RegisterActivityServiceHandlerFromEndpoint is same as RegisterActivityServiceHandler but+// automatically dials to "endpoint" and closes the connection when "ctx" gets done.+func RegisterActivityServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) {+ conn, err := grpc.DialContext(ctx, endpoint, opts...)+ if err != nil {+ return err+ }+ defer func() {+ if err != nil {+ if cerr := conn.Close(); cerr != nil {+ grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr)+ }+ return+ }+ go func() {+ <-ctx.Done()+ if cerr := conn.Close(); cerr != nil {+ grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr)+ }+ }()+ }()++ return RegisterActivityServiceHandler(ctx, mux, conn)+}++// RegisterActivityServiceHandler registers the http handlers for service ActivityService to "mux".+// The handlers forward requests to the grpc endpoint over "conn".+func RegisterActivityServiceHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error {+ return RegisterActivityServiceHandlerClient(ctx, mux, NewActivityServiceClient(conn))+}++// RegisterActivityServiceHandlerClient registers the http handlers for service ActivityService+// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "ActivityServiceClient".+// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "ActivityServiceClient"+// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in+// "ActivityServiceClient" to call the correct interceptors.+func RegisterActivityServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ActivityServiceClient) error {++ mux.Handle("GET", pattern_ActivityService_GetActivity_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {+ ctx, cancel := context.WithCancel(req.Context())+ defer cancel()+ inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)+ var err error+ var annotatedContext context.Context+ annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/memos.api.v2.ActivityService/GetActivity", runtime.WithHTTPPathPattern("/v2/activities"))+ if err != nil {+ runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)+ return+ }+ resp, md, err := request_ActivityService_GetActivity_0(annotatedContext, inboundMarshaler, client, req, pathParams)+ annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)+ if err != nil {+ runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)+ return+ }++ forward_ActivityService_GetActivity_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)++ })++ return nil+}++var (+ pattern_ActivityService_GetActivity_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v2", "activities"}, ""))+)++var (+ forward_ActivityService_GetActivity_0 = runtime.ForwardResponseMessage+)diff --git a/proto/gen/api/v2/activity_service_grpc.pb.go b/proto/gen/api/v2/activity_service_grpc.pb.gonew file mode 100644index 000000000..1def9148c--- /dev/null+++ b/proto/gen/api/v2/activity_service_grpc.pb.go@@ -0,0 +1,109 @@+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.+// versions:+// - protoc-gen-go-grpc v1.3.0+// - protoc (unknown)+// source: api/v2/activity_service.proto++package apiv2++import (+ context "context"+ grpc "google.golang.org/grpc"+ codes "google.golang.org/grpc/codes"+ status "google.golang.org/grpc/status"+)++// This is a compile-time assertion to ensure that this generated file+// is compatible with the grpc package it is being compiled against.+// Requires gRPC-Go v1.32.0 or later.+const _ = grpc.SupportPackageIsVersion7++const (+ ActivityService_GetActivity_FullMethodName = "/memos.api.v2.ActivityService/GetActivity"+)++// ActivityServiceClient is the client API for ActivityService service.+//+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.+type ActivityServiceClient interface {+ GetActivity(ctx context.Context, in *GetActivityRequest, opts ...grpc.CallOption) (*GetActivityResponse, error)+}++type activityServiceClient struct {+ cc grpc.ClientConnInterface+}++func NewActivityServiceClient(cc grpc.ClientConnInterface) ActivityServiceClient {+ return &activityServiceClient{cc}+}++func (c *activityServiceClient) GetActivity(ctx context.Context, in *GetActivityRequest, opts ...grpc.CallOption) (*GetActivityResponse, error) {+ out := new(GetActivityResponse)+ err := c.cc.Invoke(ctx, ActivityService_GetActivity_FullMethodName, in, out, opts...)+ if err != nil {+ return nil, err+ }+ return out, nil+}++// ActivityServiceServer is the server API for ActivityService service.+// All implementations must embed UnimplementedActivityServiceServer+// for forward compatibility+type ActivityServiceServer interface {+ GetActivity(context.Context, *GetActivityRequest) (*GetActivityResponse, error)+ mustEmbedUnimplementedActivityServiceServer()+}++// UnimplementedActivityServiceServer must be embedded to have forward compatible implementations.+type UnimplementedActivityServiceServer struct {+}++func (UnimplementedActivityServiceServer) GetActivity(context.Context, *GetActivityRequest) (*GetActivityResponse, error) {+ return nil, status.Errorf(codes.Unimplemented, "method GetActivity not implemented")+}+func (UnimplementedActivityServiceServer) mustEmbedUnimplementedActivityServiceServer() {}++// UnsafeActivityServiceServer may be embedded to opt out of forward compatibility for this service.+// Use of this interface is not recommended, as added methods to ActivityServiceServer will+// result in compilation errors.+type UnsafeActivityServiceServer interface {+ mustEmbedUnimplementedActivityServiceServer()+}++func RegisterActivityServiceServer(s grpc.ServiceRegistrar, srv ActivityServiceServer) {+ s.RegisterService(&ActivityService_ServiceDesc, srv)+}++func _ActivityService_GetActivity_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {+ in := new(GetActivityRequest)+ if err := dec(in); err != nil {+ return nil, err+ }+ if interceptor == nil {+ return srv.(ActivityServiceServer).GetActivity(ctx, in)+ }+ info := &grpc.UnaryServerInfo{+ Server: srv,+ FullMethod: ActivityService_GetActivity_FullMethodName,+ }+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {+ return srv.(ActivityServiceServer).GetActivity(ctx, req.(*GetActivityRequest))+ }+ return interceptor(ctx, in, info, handler)+}++// ActivityService_ServiceDesc is the grpc.ServiceDesc for ActivityService service.+// It's only intended for direct use with grpc.RegisterService,+// and not to be introspected or modified (even as a copy)+var ActivityService_ServiceDesc = grpc.ServiceDesc{+ ServiceName: "memos.api.v2.ActivityService",+ HandlerType: (*ActivityServiceServer)(nil),+ Methods: []grpc.MethodDesc{+ {+ MethodName: "GetActivity",+ Handler: _ActivityService_GetActivity_Handler,+ },+ },+ Streams: []grpc.StreamDesc{},+ Metadata: "api/v2/activity_service.proto",+}diff --git a/store/activity.go b/store/activity.goindex 20da01cca..3da43db5f 100644--- a/store/activity.go+++ b/store/activity.go@@ -50,3 +50,14 @@ func (s *Store) CreateActivity(ctx context.Context, create *Activity) (*Activityfunc (s *Store) ListActivities(ctx context.Context, find *FindActivity) ([]*Activity, error) {return s.driver.ListActivities(ctx, find)}++func (s *Store) GetActivity(ctx context.Context, find *FindActivity) (*Activity, error) {+ list, err := s.ListActivities(ctx, find)+ if err != nil {+ return nil, err+ }+ if len(list) == 0 {+ return nil, nil+ }+ return list[0], nil+}