From 8f91649d257020e11bfb651d36ce5c7695720c82 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Sat, 29 Mar 2025 17:56:38 +0800 Subject: [PATCH] :sparkles: DirectAccess in filekit --- pkg/filekit/io.go | 91 ++++++ pkg/internal/grpc/attachment.go | 7 +- pkg/internal/models/attachments.go | 20 -- pkg/proto/attachment.pb.go | 483 ++++++++++------------------- pkg/proto/attachment.proto | 15 +- pkg/proto/attachment_grpc.pb.go | 2 +- 6 files changed, 260 insertions(+), 358 deletions(-) diff --git a/pkg/filekit/io.go b/pkg/filekit/io.go index cf498d7..82a644f 100644 --- a/pkg/filekit/io.go +++ b/pkg/filekit/io.go @@ -2,11 +2,102 @@ package filekit import ( "context" + "time" "git.solsynth.dev/hypernet/nexus/pkg/nex" + "git.solsynth.dev/hypernet/nexus/pkg/nex/cachekit" + "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" "git.solsynth.dev/hypernet/paperclip/pkg/proto" + "github.com/goccy/go-json" ) +func GetAttachment(c *nex.Conn, rid string) (models.Attachment, error) { + cacheConn, err := cachekit.NewConn(c, 3*time.Second) + if err == nil { + key := cachekit.FKey(cachekit.DAAttachment, rid) + if attachment, err := cachekit.Get[models.Attachment](cacheConn, key); err == nil { + return attachment, nil + } + } + + var attachment models.Attachment + conn, err := c.GetClientGrpcConn("uc") + if err != nil { + return attachment, nil + } + + pc := proto.NewAttachmentServiceClient(conn) + resp, err := pc.GetAttachment(context.Background(), &proto.GetAttachmentRequest{ + Rid: &rid, + }) + if err != nil { + return attachment, err + } + + if err := json.Unmarshal(resp.Attachment, &attachment); err != nil { + return attachment, err + } + + return attachment, nil +} + +func ListAttachment(c *nex.Conn, rid []string) ([]models.Attachment, error) { + var attachments []models.Attachment + var missingRid []string + cachedAttachments := make(map[string]models.Attachment) + + // Try to get attachments from cache + cacheConn, err := cachekit.NewConn(c, 3*time.Second) + if err == nil { + for _, rid := range rid { + key := cachekit.FKey(cachekit.DAAttachment, rid) + if attachment, err := cachekit.Get[models.Attachment](cacheConn, key); err == nil { + cachedAttachments[rid] = attachment + } else { + missingRid = append(missingRid, rid) + } + } + } + + // If all attachments are found in cache, return them + if len(missingRid) == 0 { + for _, attachment := range cachedAttachments { + attachments = append(attachments, attachment) + } + return attachments, nil + } + + // Fetch missing attachments from the gRPC service + conn, err := c.GetClientGrpcConn("uc") + if err != nil { + return attachments, err + } + + pc := proto.NewAttachmentServiceClient(conn) + resp, err := pc.ListAttachment(context.Background(), &proto.ListAttachmentRequest{ + Rid: missingRid, + }) + if err != nil { + return attachments, err + } + + // Parse the fetched attachments + for _, item := range resp.GetAttachments() { + var attachment models.Attachment + if err := json.Unmarshal(item, &attachment); err != nil { + return attachments, err + } + attachments = append(attachments, attachment) + } + + // Merge cached and fetched results + for _, attachment := range cachedAttachments { + attachments = append(attachments, attachment) + } + + return attachments, nil +} + func UpdateVisibility(c *nex.Conn, request *proto.UpdateVisibilityRequest) error { conn, err := c.GetClientGrpcConn("uc") if err != nil { diff --git a/pkg/internal/grpc/attachment.go b/pkg/internal/grpc/attachment.go index 4b8df28..f1649a5 100644 --- a/pkg/internal/grpc/attachment.go +++ b/pkg/internal/grpc/attachment.go @@ -3,6 +3,7 @@ package grpc import ( "context" + "git.solsynth.dev/hypernet/nexus/pkg/nex" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" @@ -33,7 +34,7 @@ func (v *Server) GetAttachment(ctx context.Context, request *proto.GetAttachment } return &proto.GetAttachmentResponse{ - Attachment: lo.ToPtr(attachment).ToAttachmentInfo(), + Attachment: nex.EncodeMap(attachment), }, nil } @@ -56,8 +57,8 @@ func (v *Server) ListAttachment(ctx context.Context, request *proto.ListAttachme } return &proto.ListAttachmentResponse{ - Attachments: lo.Map(attachments, func(v models.Attachment, _ int) *proto.AttachmentInfo { - return v.ToAttachmentInfo() + Attachments: lo.Map(attachments, func(v models.Attachment, _ int) []byte { + return nex.EncodeMap(v) }), }, nil } diff --git a/pkg/internal/models/attachments.go b/pkg/internal/models/attachments.go index 98943f5..619d9ef 100644 --- a/pkg/internal/models/attachments.go +++ b/pkg/internal/models/attachments.go @@ -1,11 +1,8 @@ package models import ( - "strconv" "time" - "git.solsynth.dev/hypernet/paperclip/pkg/proto" - "git.solsynth.dev/hypernet/nexus/pkg/nex/cachekit" "git.solsynth.dev/hypernet/nexus/pkg/nex/cruda" @@ -79,23 +76,6 @@ type Attachment struct { IsMature bool `json:"is_mature" gorm:"-"` } -func (v *Attachment) ToAttachmentInfo() *proto.AttachmentInfo { - if v == nil { - return nil - } - - return &proto.AttachmentInfo{ - Id: v.Uuid, - Rid: v.Rid, - Name: v.Name, - Type: v.MimeType, - Size: strconv.FormatInt(v.Size, 10), - Hash: v.HashCode, - Mime: v.MimeType, - IsIndexable: v.IsIndexable, - } -} - func (v *Attachment) AfterUpdate(tx *gorm.DB) error { cachekit.FKey(cachekit.DAAttachment, v.Rid) diff --git a/pkg/proto/attachment.pb.go b/pkg/proto/attachment.pb.go index 0f56a16..9313868 100644 --- a/pkg/proto/attachment.pb.go +++ b/pkg/proto/attachment.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 -// protoc v5.28.3 +// protoc-gen-go v1.36.6 +// protoc v5.29.3 // source: attachment.proto package proto @@ -11,6 +11,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -20,120 +21,18 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type AttachmentInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Rid string `protobuf:"bytes,2,opt,name=rid,proto3" json:"rid,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Type string `protobuf:"bytes,4,opt,name=type,proto3" json:"type,omitempty"` - Size string `protobuf:"bytes,5,opt,name=size,proto3" json:"size,omitempty"` - Hash string `protobuf:"bytes,6,opt,name=hash,proto3" json:"hash,omitempty"` - Mime string `protobuf:"bytes,7,opt,name=mime,proto3" json:"mime,omitempty"` - IsIndexable bool `protobuf:"varint,8,opt,name=is_indexable,json=isIndexable,proto3" json:"is_indexable,omitempty"` -} - -func (x *AttachmentInfo) Reset() { - *x = AttachmentInfo{} - mi := &file_attachment_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *AttachmentInfo) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AttachmentInfo) ProtoMessage() {} - -func (x *AttachmentInfo) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[0] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AttachmentInfo.ProtoReflect.Descriptor instead. -func (*AttachmentInfo) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{0} -} - -func (x *AttachmentInfo) GetId() string { - if x != nil { - return x.Id - } - return "" -} - -func (x *AttachmentInfo) GetRid() string { - if x != nil { - return x.Rid - } - return "" -} - -func (x *AttachmentInfo) GetName() string { - if x != nil { - return x.Name - } - return "" -} - -func (x *AttachmentInfo) GetType() string { - if x != nil { - return x.Type - } - return "" -} - -func (x *AttachmentInfo) GetSize() string { - if x != nil { - return x.Size - } - return "" -} - -func (x *AttachmentInfo) GetHash() string { - if x != nil { - return x.Hash - } - return "" -} - -func (x *AttachmentInfo) GetMime() string { - if x != nil { - return x.Mime - } - return "" -} - -func (x *AttachmentInfo) GetIsIndexable() bool { - if x != nil { - return x.IsIndexable - } - return false -} - type GetAttachmentRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id *uint64 `protobuf:"varint,1,opt,name=id,proto3,oneof" json:"id,omitempty"` + Rid *string `protobuf:"bytes,2,opt,name=rid,proto3,oneof" json:"rid,omitempty"` + UserId *uint64 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"` unknownFields protoimpl.UnknownFields - - Id *uint64 `protobuf:"varint,1,opt,name=id,proto3,oneof" json:"id,omitempty"` - Rid *string `protobuf:"bytes,2,opt,name=rid,proto3,oneof" json:"rid,omitempty"` - UserId *uint64 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GetAttachmentRequest) Reset() { *x = GetAttachmentRequest{} - mi := &file_attachment_proto_msgTypes[1] + mi := &file_attachment_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -145,7 +44,7 @@ func (x *GetAttachmentRequest) String() string { func (*GetAttachmentRequest) ProtoMessage() {} func (x *GetAttachmentRequest) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[1] + mi := &file_attachment_proto_msgTypes[0] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -158,7 +57,7 @@ func (x *GetAttachmentRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetAttachmentRequest.ProtoReflect.Descriptor instead. func (*GetAttachmentRequest) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{1} + return file_attachment_proto_rawDescGZIP(), []int{0} } func (x *GetAttachmentRequest) GetId() uint64 { @@ -183,16 +82,15 @@ func (x *GetAttachmentRequest) GetUserId() uint64 { } type GetAttachmentResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Attachment []byte `protobuf:"bytes,1,opt,name=attachment,proto3,oneof" json:"attachment,omitempty"` unknownFields protoimpl.UnknownFields - - Attachment *AttachmentInfo `protobuf:"bytes,1,opt,name=attachment,proto3,oneof" json:"attachment,omitempty"` + sizeCache protoimpl.SizeCache } func (x *GetAttachmentResponse) Reset() { *x = GetAttachmentResponse{} - mi := &file_attachment_proto_msgTypes[2] + mi := &file_attachment_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -204,7 +102,7 @@ func (x *GetAttachmentResponse) String() string { func (*GetAttachmentResponse) ProtoMessage() {} func (x *GetAttachmentResponse) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[2] + mi := &file_attachment_proto_msgTypes[1] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -217,10 +115,10 @@ func (x *GetAttachmentResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetAttachmentResponse.ProtoReflect.Descriptor instead. func (*GetAttachmentResponse) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{2} + return file_attachment_proto_rawDescGZIP(), []int{1} } -func (x *GetAttachmentResponse) GetAttachment() *AttachmentInfo { +func (x *GetAttachmentResponse) GetAttachment() []byte { if x != nil { return x.Attachment } @@ -228,18 +126,17 @@ func (x *GetAttachmentResponse) GetAttachment() *AttachmentInfo { } type ListAttachmentRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id []uint64 `protobuf:"varint,1,rep,packed,name=id,proto3" json:"id,omitempty"` + Rid []string `protobuf:"bytes,2,rep,name=rid,proto3" json:"rid,omitempty"` + UserId *uint64 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"` unknownFields protoimpl.UnknownFields - - Id []uint64 `protobuf:"varint,1,rep,packed,name=id,proto3" json:"id,omitempty"` - Rid []string `protobuf:"bytes,2,rep,name=rid,proto3" json:"rid,omitempty"` - UserId *uint64 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ListAttachmentRequest) Reset() { *x = ListAttachmentRequest{} - mi := &file_attachment_proto_msgTypes[3] + mi := &file_attachment_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -251,7 +148,7 @@ func (x *ListAttachmentRequest) String() string { func (*ListAttachmentRequest) ProtoMessage() {} func (x *ListAttachmentRequest) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[3] + mi := &file_attachment_proto_msgTypes[2] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -264,7 +161,7 @@ func (x *ListAttachmentRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListAttachmentRequest.ProtoReflect.Descriptor instead. func (*ListAttachmentRequest) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{3} + return file_attachment_proto_rawDescGZIP(), []int{2} } func (x *ListAttachmentRequest) GetId() []uint64 { @@ -289,16 +186,15 @@ func (x *ListAttachmentRequest) GetUserId() uint64 { } type ListAttachmentResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Attachments [][]byte `protobuf:"bytes,1,rep,name=attachments,proto3" json:"attachments,omitempty"` unknownFields protoimpl.UnknownFields - - Attachments []*AttachmentInfo `protobuf:"bytes,1,rep,name=attachments,proto3" json:"attachments,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ListAttachmentResponse) Reset() { *x = ListAttachmentResponse{} - mi := &file_attachment_proto_msgTypes[4] + mi := &file_attachment_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -310,7 +206,7 @@ func (x *ListAttachmentResponse) String() string { func (*ListAttachmentResponse) ProtoMessage() {} func (x *ListAttachmentResponse) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[4] + mi := &file_attachment_proto_msgTypes[3] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -323,10 +219,10 @@ func (x *ListAttachmentResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListAttachmentResponse.ProtoReflect.Descriptor instead. func (*ListAttachmentResponse) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{4} + return file_attachment_proto_rawDescGZIP(), []int{3} } -func (x *ListAttachmentResponse) GetAttachments() []*AttachmentInfo { +func (x *ListAttachmentResponse) GetAttachments() [][]byte { if x != nil { return x.Attachments } @@ -334,19 +230,18 @@ func (x *ListAttachmentResponse) GetAttachments() []*AttachmentInfo { } type UpdateVisibilityRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id []uint64 `protobuf:"varint,1,rep,packed,name=id,proto3" json:"id,omitempty"` + Rid []string `protobuf:"bytes,2,rep,name=rid,proto3" json:"rid,omitempty"` + IsIndexable bool `protobuf:"varint,3,opt,name=is_indexable,json=isIndexable,proto3" json:"is_indexable,omitempty"` + UserId *uint64 `protobuf:"varint,4,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"` unknownFields protoimpl.UnknownFields - - Id []uint64 `protobuf:"varint,1,rep,packed,name=id,proto3" json:"id,omitempty"` - Rid []string `protobuf:"bytes,2,rep,name=rid,proto3" json:"rid,omitempty"` - IsIndexable bool `protobuf:"varint,3,opt,name=is_indexable,json=isIndexable,proto3" json:"is_indexable,omitempty"` - UserId *uint64 `protobuf:"varint,4,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *UpdateVisibilityRequest) Reset() { *x = UpdateVisibilityRequest{} - mi := &file_attachment_proto_msgTypes[5] + mi := &file_attachment_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -358,7 +253,7 @@ func (x *UpdateVisibilityRequest) String() string { func (*UpdateVisibilityRequest) ProtoMessage() {} func (x *UpdateVisibilityRequest) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[5] + mi := &file_attachment_proto_msgTypes[4] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -371,7 +266,7 @@ func (x *UpdateVisibilityRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateVisibilityRequest.ProtoReflect.Descriptor instead. func (*UpdateVisibilityRequest) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{5} + return file_attachment_proto_rawDescGZIP(), []int{4} } func (x *UpdateVisibilityRequest) GetId() []uint64 { @@ -403,16 +298,15 @@ func (x *UpdateVisibilityRequest) GetUserId() uint64 { } type UpdateVisibilityResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Count int32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` unknownFields protoimpl.UnknownFields - - Count int32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` + sizeCache protoimpl.SizeCache } func (x *UpdateVisibilityResponse) Reset() { *x = UpdateVisibilityResponse{} - mi := &file_attachment_proto_msgTypes[6] + mi := &file_attachment_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -424,7 +318,7 @@ func (x *UpdateVisibilityResponse) String() string { func (*UpdateVisibilityResponse) ProtoMessage() {} func (x *UpdateVisibilityResponse) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[6] + mi := &file_attachment_proto_msgTypes[5] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -437,7 +331,7 @@ func (x *UpdateVisibilityResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateVisibilityResponse.ProtoReflect.Descriptor instead. func (*UpdateVisibilityResponse) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{6} + return file_attachment_proto_rawDescGZIP(), []int{5} } func (x *UpdateVisibilityResponse) GetCount() int32 { @@ -448,18 +342,17 @@ func (x *UpdateVisibilityResponse) GetCount() int32 { } type UpdateUsageRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id []uint64 `protobuf:"varint,1,rep,packed,name=id,proto3" json:"id,omitempty"` + Rid []string `protobuf:"bytes,2,rep,name=rid,proto3" json:"rid,omitempty"` + Delta int64 `protobuf:"varint,3,opt,name=delta,proto3" json:"delta,omitempty"` unknownFields protoimpl.UnknownFields - - Id []uint64 `protobuf:"varint,1,rep,packed,name=id,proto3" json:"id,omitempty"` - Rid []string `protobuf:"bytes,2,rep,name=rid,proto3" json:"rid,omitempty"` - Delta int64 `protobuf:"varint,3,opt,name=delta,proto3" json:"delta,omitempty"` + sizeCache protoimpl.SizeCache } func (x *UpdateUsageRequest) Reset() { *x = UpdateUsageRequest{} - mi := &file_attachment_proto_msgTypes[7] + mi := &file_attachment_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -471,7 +364,7 @@ func (x *UpdateUsageRequest) String() string { func (*UpdateUsageRequest) ProtoMessage() {} func (x *UpdateUsageRequest) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[7] + mi := &file_attachment_proto_msgTypes[6] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -484,7 +377,7 @@ func (x *UpdateUsageRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateUsageRequest.ProtoReflect.Descriptor instead. func (*UpdateUsageRequest) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{7} + return file_attachment_proto_rawDescGZIP(), []int{6} } func (x *UpdateUsageRequest) GetId() []uint64 { @@ -509,16 +402,15 @@ func (x *UpdateUsageRequest) GetDelta() int64 { } type UpdateUsageResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Count int32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` unknownFields protoimpl.UnknownFields - - Count int32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` + sizeCache protoimpl.SizeCache } func (x *UpdateUsageResponse) Reset() { *x = UpdateUsageResponse{} - mi := &file_attachment_proto_msgTypes[8] + mi := &file_attachment_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -530,7 +422,7 @@ func (x *UpdateUsageResponse) String() string { func (*UpdateUsageResponse) ProtoMessage() {} func (x *UpdateUsageResponse) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[8] + mi := &file_attachment_proto_msgTypes[7] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -543,7 +435,7 @@ func (x *UpdateUsageResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateUsageResponse.ProtoReflect.Descriptor instead. func (*UpdateUsageResponse) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{8} + return file_attachment_proto_rawDescGZIP(), []int{7} } func (x *UpdateUsageResponse) GetCount() int32 { @@ -554,18 +446,17 @@ func (x *UpdateUsageResponse) GetCount() int32 { } type DeleteAttachmentRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id []uint64 `protobuf:"varint,1,rep,packed,name=id,proto3" json:"id,omitempty"` + Rid []string `protobuf:"bytes,2,rep,name=rid,proto3" json:"rid,omitempty"` + UserId *uint64 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"` unknownFields protoimpl.UnknownFields - - Id []uint64 `protobuf:"varint,1,rep,packed,name=id,proto3" json:"id,omitempty"` - Rid []string `protobuf:"bytes,2,rep,name=rid,proto3" json:"rid,omitempty"` - UserId *uint64 `protobuf:"varint,3,opt,name=user_id,json=userId,proto3,oneof" json:"user_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *DeleteAttachmentRequest) Reset() { *x = DeleteAttachmentRequest{} - mi := &file_attachment_proto_msgTypes[9] + mi := &file_attachment_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -577,7 +468,7 @@ func (x *DeleteAttachmentRequest) String() string { func (*DeleteAttachmentRequest) ProtoMessage() {} func (x *DeleteAttachmentRequest) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[9] + mi := &file_attachment_proto_msgTypes[8] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -590,7 +481,7 @@ func (x *DeleteAttachmentRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteAttachmentRequest.ProtoReflect.Descriptor instead. func (*DeleteAttachmentRequest) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{9} + return file_attachment_proto_rawDescGZIP(), []int{8} } func (x *DeleteAttachmentRequest) GetId() []uint64 { @@ -615,16 +506,15 @@ func (x *DeleteAttachmentRequest) GetUserId() uint64 { } type DeleteAttachmentResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Count int32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` unknownFields protoimpl.UnknownFields - - Count int32 `protobuf:"varint,1,opt,name=count,proto3" json:"count,omitempty"` + sizeCache protoimpl.SizeCache } func (x *DeleteAttachmentResponse) Reset() { *x = DeleteAttachmentResponse{} - mi := &file_attachment_proto_msgTypes[10] + mi := &file_attachment_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -636,7 +526,7 @@ func (x *DeleteAttachmentResponse) String() string { func (*DeleteAttachmentResponse) ProtoMessage() {} func (x *DeleteAttachmentResponse) ProtoReflect() protoreflect.Message { - mi := &file_attachment_proto_msgTypes[10] + mi := &file_attachment_proto_msgTypes[9] if x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -649,7 +539,7 @@ func (x *DeleteAttachmentResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use DeleteAttachmentResponse.ProtoReflect.Descriptor instead. func (*DeleteAttachmentResponse) Descriptor() ([]byte, []int) { - return file_attachment_proto_rawDescGZIP(), []int{10} + return file_attachment_proto_rawDescGZIP(), []int{9} } func (x *DeleteAttachmentResponse) GetCount() int32 { @@ -661,149 +551,101 @@ func (x *DeleteAttachmentResponse) GetCount() int32 { var File_attachment_proto protoreflect.FileDescriptor -var file_attachment_proto_rawDesc = []byte{ - 0x0a, 0x10, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x05, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb9, 0x01, 0x0a, 0x0e, 0x41, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, - 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x12, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, - 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x12, - 0x0a, 0x04, 0x6d, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x69, - 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x61, 0x62, - 0x6c, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x49, 0x6e, 0x64, 0x65, - 0x78, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x7b, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x13, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x02, 0x69, 0x64, 0x88, - 0x01, 0x01, 0x12, 0x15, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x01, 0x52, 0x03, 0x72, 0x69, 0x64, 0x88, 0x01, 0x01, 0x12, 0x1c, 0x0a, 0x07, 0x75, 0x73, 0x65, - 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x48, 0x02, 0x52, 0x06, 0x75, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x05, 0x0a, 0x03, 0x5f, 0x69, 0x64, 0x42, 0x06, - 0x0a, 0x04, 0x5f, 0x72, 0x69, 0x64, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, - 0x69, 0x64, 0x22, 0x62, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, - 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x48, 0x00, 0x52, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x6d, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x63, 0x0a, 0x15, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, - 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, - 0x64, 0x12, 0x1c, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, - 0x0a, 0x0a, 0x08, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x22, 0x51, 0x0a, 0x16, 0x4c, - 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x37, 0x0a, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x88, - 0x01, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, - 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x0c, - 0x69, 0x73, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x61, 0x62, 0x6c, 0x65, 0x12, - 0x1c, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, - 0x48, 0x00, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, - 0x08, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x22, 0x30, 0x0a, 0x18, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x4c, 0x0a, 0x12, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, - 0x72, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x05, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x13, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x65, 0x0a, 0x17, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, - 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, - 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, - 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x22, 0x30, 0x0a, - 0x18, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x32, - 0xa8, 0x03, 0x0a, 0x11, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x4c, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, - 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x41, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4c, 0x69, 0x73, 0x74, - 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, - 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x46, 0x0a, 0x0b, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x12, 0x19, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x3b, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +const file_attachment_proto_rawDesc = "" + + "\n" + + "\x10attachment.proto\x12\x05proto\"{\n" + + "\x14GetAttachmentRequest\x12\x13\n" + + "\x02id\x18\x01 \x01(\x04H\x00R\x02id\x88\x01\x01\x12\x15\n" + + "\x03rid\x18\x02 \x01(\tH\x01R\x03rid\x88\x01\x01\x12\x1c\n" + + "\auser_id\x18\x03 \x01(\x04H\x02R\x06userId\x88\x01\x01B\x05\n" + + "\x03_idB\x06\n" + + "\x04_ridB\n" + + "\n" + + "\b_user_id\"K\n" + + "\x15GetAttachmentResponse\x12#\n" + + "\n" + + "attachment\x18\x01 \x01(\fH\x00R\n" + + "attachment\x88\x01\x01B\r\n" + + "\v_attachment\"c\n" + + "\x15ListAttachmentRequest\x12\x0e\n" + + "\x02id\x18\x01 \x03(\x04R\x02id\x12\x10\n" + + "\x03rid\x18\x02 \x03(\tR\x03rid\x12\x1c\n" + + "\auser_id\x18\x03 \x01(\x04H\x00R\x06userId\x88\x01\x01B\n" + + "\n" + + "\b_user_id\":\n" + + "\x16ListAttachmentResponse\x12 \n" + + "\vattachments\x18\x01 \x03(\fR\vattachments\"\x88\x01\n" + + "\x17UpdateVisibilityRequest\x12\x0e\n" + + "\x02id\x18\x01 \x03(\x04R\x02id\x12\x10\n" + + "\x03rid\x18\x02 \x03(\tR\x03rid\x12!\n" + + "\fis_indexable\x18\x03 \x01(\bR\visIndexable\x12\x1c\n" + + "\auser_id\x18\x04 \x01(\x04H\x00R\x06userId\x88\x01\x01B\n" + + "\n" + + "\b_user_id\"0\n" + + "\x18UpdateVisibilityResponse\x12\x14\n" + + "\x05count\x18\x01 \x01(\x05R\x05count\"L\n" + + "\x12UpdateUsageRequest\x12\x0e\n" + + "\x02id\x18\x01 \x03(\x04R\x02id\x12\x10\n" + + "\x03rid\x18\x02 \x03(\tR\x03rid\x12\x14\n" + + "\x05delta\x18\x03 \x01(\x03R\x05delta\"+\n" + + "\x13UpdateUsageResponse\x12\x14\n" + + "\x05count\x18\x01 \x01(\x05R\x05count\"e\n" + + "\x17DeleteAttachmentRequest\x12\x0e\n" + + "\x02id\x18\x01 \x03(\x04R\x02id\x12\x10\n" + + "\x03rid\x18\x02 \x03(\tR\x03rid\x12\x1c\n" + + "\auser_id\x18\x03 \x01(\x04H\x00R\x06userId\x88\x01\x01B\n" + + "\n" + + "\b_user_id\"0\n" + + "\x18DeleteAttachmentResponse\x12\x14\n" + + "\x05count\x18\x01 \x01(\x05R\x05count2\xa8\x03\n" + + "\x11AttachmentService\x12L\n" + + "\rGetAttachment\x12\x1b.proto.GetAttachmentRequest\x1a\x1c.proto.GetAttachmentResponse\"\x00\x12O\n" + + "\x0eListAttachment\x12\x1c.proto.ListAttachmentRequest\x1a\x1d.proto.ListAttachmentResponse\"\x00\x12U\n" + + "\x10UpdateVisibility\x12\x1e.proto.UpdateVisibilityRequest\x1a\x1f.proto.UpdateVisibilityResponse\"\x00\x12F\n" + + "\vUpdateUsage\x12\x19.proto.UpdateUsageRequest\x1a\x1a.proto.UpdateUsageResponse\"\x00\x12U\n" + + "\x10DeleteAttachment\x12\x1e.proto.DeleteAttachmentRequest\x1a\x1f.proto.DeleteAttachmentResponse\"\x00B\tZ\a.;protob\x06proto3" var ( file_attachment_proto_rawDescOnce sync.Once - file_attachment_proto_rawDescData = file_attachment_proto_rawDesc + file_attachment_proto_rawDescData []byte ) func file_attachment_proto_rawDescGZIP() []byte { file_attachment_proto_rawDescOnce.Do(func() { - file_attachment_proto_rawDescData = protoimpl.X.CompressGZIP(file_attachment_proto_rawDescData) + file_attachment_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_attachment_proto_rawDesc), len(file_attachment_proto_rawDesc))) }) return file_attachment_proto_rawDescData } -var file_attachment_proto_msgTypes = make([]protoimpl.MessageInfo, 11) +var file_attachment_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_attachment_proto_goTypes = []any{ - (*AttachmentInfo)(nil), // 0: proto.AttachmentInfo - (*GetAttachmentRequest)(nil), // 1: proto.GetAttachmentRequest - (*GetAttachmentResponse)(nil), // 2: proto.GetAttachmentResponse - (*ListAttachmentRequest)(nil), // 3: proto.ListAttachmentRequest - (*ListAttachmentResponse)(nil), // 4: proto.ListAttachmentResponse - (*UpdateVisibilityRequest)(nil), // 5: proto.UpdateVisibilityRequest - (*UpdateVisibilityResponse)(nil), // 6: proto.UpdateVisibilityResponse - (*UpdateUsageRequest)(nil), // 7: proto.UpdateUsageRequest - (*UpdateUsageResponse)(nil), // 8: proto.UpdateUsageResponse - (*DeleteAttachmentRequest)(nil), // 9: proto.DeleteAttachmentRequest - (*DeleteAttachmentResponse)(nil), // 10: proto.DeleteAttachmentResponse + (*GetAttachmentRequest)(nil), // 0: proto.GetAttachmentRequest + (*GetAttachmentResponse)(nil), // 1: proto.GetAttachmentResponse + (*ListAttachmentRequest)(nil), // 2: proto.ListAttachmentRequest + (*ListAttachmentResponse)(nil), // 3: proto.ListAttachmentResponse + (*UpdateVisibilityRequest)(nil), // 4: proto.UpdateVisibilityRequest + (*UpdateVisibilityResponse)(nil), // 5: proto.UpdateVisibilityResponse + (*UpdateUsageRequest)(nil), // 6: proto.UpdateUsageRequest + (*UpdateUsageResponse)(nil), // 7: proto.UpdateUsageResponse + (*DeleteAttachmentRequest)(nil), // 8: proto.DeleteAttachmentRequest + (*DeleteAttachmentResponse)(nil), // 9: proto.DeleteAttachmentResponse } var file_attachment_proto_depIdxs = []int32{ - 0, // 0: proto.GetAttachmentResponse.attachment:type_name -> proto.AttachmentInfo - 0, // 1: proto.ListAttachmentResponse.attachments:type_name -> proto.AttachmentInfo - 1, // 2: proto.AttachmentService.GetAttachment:input_type -> proto.GetAttachmentRequest - 3, // 3: proto.AttachmentService.ListAttachment:input_type -> proto.ListAttachmentRequest - 5, // 4: proto.AttachmentService.UpdateVisibility:input_type -> proto.UpdateVisibilityRequest - 7, // 5: proto.AttachmentService.UpdateUsage:input_type -> proto.UpdateUsageRequest - 9, // 6: proto.AttachmentService.DeleteAttachment:input_type -> proto.DeleteAttachmentRequest - 2, // 7: proto.AttachmentService.GetAttachment:output_type -> proto.GetAttachmentResponse - 4, // 8: proto.AttachmentService.ListAttachment:output_type -> proto.ListAttachmentResponse - 6, // 9: proto.AttachmentService.UpdateVisibility:output_type -> proto.UpdateVisibilityResponse - 8, // 10: proto.AttachmentService.UpdateUsage:output_type -> proto.UpdateUsageResponse - 10, // 11: proto.AttachmentService.DeleteAttachment:output_type -> proto.DeleteAttachmentResponse - 7, // [7:12] is the sub-list for method output_type - 2, // [2:7] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 0, // 0: proto.AttachmentService.GetAttachment:input_type -> proto.GetAttachmentRequest + 2, // 1: proto.AttachmentService.ListAttachment:input_type -> proto.ListAttachmentRequest + 4, // 2: proto.AttachmentService.UpdateVisibility:input_type -> proto.UpdateVisibilityRequest + 6, // 3: proto.AttachmentService.UpdateUsage:input_type -> proto.UpdateUsageRequest + 8, // 4: proto.AttachmentService.DeleteAttachment:input_type -> proto.DeleteAttachmentRequest + 1, // 5: proto.AttachmentService.GetAttachment:output_type -> proto.GetAttachmentResponse + 3, // 6: proto.AttachmentService.ListAttachment:output_type -> proto.ListAttachmentResponse + 5, // 7: proto.AttachmentService.UpdateVisibility:output_type -> proto.UpdateVisibilityResponse + 7, // 8: proto.AttachmentService.UpdateUsage:output_type -> proto.UpdateUsageResponse + 9, // 9: proto.AttachmentService.DeleteAttachment:output_type -> proto.DeleteAttachmentResponse + 5, // [5:10] is the sub-list for method output_type + 0, // [0:5] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name } func init() { file_attachment_proto_init() } @@ -811,18 +653,18 @@ func file_attachment_proto_init() { if File_attachment_proto != nil { return } + file_attachment_proto_msgTypes[0].OneofWrappers = []any{} file_attachment_proto_msgTypes[1].OneofWrappers = []any{} file_attachment_proto_msgTypes[2].OneofWrappers = []any{} - file_attachment_proto_msgTypes[3].OneofWrappers = []any{} - file_attachment_proto_msgTypes[5].OneofWrappers = []any{} - file_attachment_proto_msgTypes[9].OneofWrappers = []any{} + file_attachment_proto_msgTypes[4].OneofWrappers = []any{} + file_attachment_proto_msgTypes[8].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_attachment_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_attachment_proto_rawDesc), len(file_attachment_proto_rawDesc)), NumEnums: 0, - NumMessages: 11, + NumMessages: 10, NumExtensions: 0, NumServices: 1, }, @@ -831,7 +673,6 @@ func file_attachment_proto_init() { MessageInfos: file_attachment_proto_msgTypes, }.Build() File_attachment_proto = out.File - file_attachment_proto_rawDesc = nil file_attachment_proto_goTypes = nil file_attachment_proto_depIdxs = nil } diff --git a/pkg/proto/attachment.proto b/pkg/proto/attachment.proto index 1e15fea..8733a96 100644 --- a/pkg/proto/attachment.proto +++ b/pkg/proto/attachment.proto @@ -12,17 +12,6 @@ service AttachmentService { rpc DeleteAttachment(DeleteAttachmentRequest) returns (DeleteAttachmentResponse) {} } -message AttachmentInfo { - string id = 1; - string rid = 2; - string name = 3; - string type = 4; - string size = 5; - string hash = 6; - string mime = 7; - bool is_indexable = 8; -} - message GetAttachmentRequest { optional uint64 id = 1; optional string rid = 2; @@ -30,7 +19,7 @@ message GetAttachmentRequest { } message GetAttachmentResponse { - optional AttachmentInfo attachment = 1; + optional bytes attachment = 1; } message ListAttachmentRequest { @@ -40,7 +29,7 @@ message ListAttachmentRequest { } message ListAttachmentResponse { - repeated AttachmentInfo attachments = 1; + repeated bytes attachments = 1; } message UpdateVisibilityRequest { diff --git a/pkg/proto/attachment_grpc.pb.go b/pkg/proto/attachment_grpc.pb.go index ac8db18..bcfd278 100644 --- a/pkg/proto/attachment_grpc.pb.go +++ b/pkg/proto/attachment_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v5.28.3 +// - protoc v5.29.3 // source: attachment.proto package proto