From dcbe135b170437e304213370851296eae285dbeb Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Sun, 20 Feb 2022 21:48:36 +0000 Subject: [PATCH] rename to memegen --- meme/.gitignore | 2 - meme/Dockerfile | 3 - meme/README.md | 7 - meme/micro.mu | 1 - meme/publicapi.json | 6 - memegen/.gitignore | 2 + memegen/Dockerfile | 3 + {meme => memegen}/Makefile | 8 +- memegen/README.md | 7 + {meme => memegen}/examples.json | 8 +- {meme => memegen}/generate.go | 0 .../meme.go => memegen/handler/memegen.go | 18 +- {meme => memegen}/main.go | 8 +- memegen/micro.mu | 1 + .../meme.pb.go => memegen/proto/memegen.pb.go | 222 +++++++++--------- .../proto/memegen.pb.micro.go | 54 ++--- .../meme.proto => memegen/proto/memegen.proto | 14 +- memegen/publicapi.json | 6 + 18 files changed, 186 insertions(+), 184 deletions(-) delete mode 100644 meme/.gitignore delete mode 100644 meme/Dockerfile delete mode 100644 meme/README.md delete mode 100644 meme/micro.mu delete mode 100644 meme/publicapi.json create mode 100644 memegen/.gitignore create mode 100644 memegen/Dockerfile rename {meme => memegen}/Makefile (66%) create mode 100644 memegen/README.md rename {meme => memegen}/examples.json (84%) rename {meme => memegen}/generate.go (100%) rename meme/handler/meme.go => memegen/handler/memegen.go (76%) rename {meme => memegen}/main.go (62%) create mode 100644 memegen/micro.mu rename meme/proto/meme.pb.go => memegen/proto/memegen.pb.go (58%) rename meme/proto/meme.pb.micro.go => memegen/proto/memegen.pb.micro.go (57%) rename meme/proto/meme.proto => memegen/proto/memegen.proto (86%) create mode 100644 memegen/publicapi.json diff --git a/meme/.gitignore b/meme/.gitignore deleted file mode 100644 index 6c5a505..0000000 --- a/meme/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ - -meme diff --git a/meme/Dockerfile b/meme/Dockerfile deleted file mode 100644 index ec3d43c..0000000 --- a/meme/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM alpine -ADD meme /meme -ENTRYPOINT [ "/meme" ] diff --git a/meme/README.md b/meme/README.md deleted file mode 100644 index fb46679..0000000 --- a/meme/README.md +++ /dev/null @@ -1,7 +0,0 @@ -Meme generator - -# Meme Service - -Generate meme. That's it. - -Powered by [Imgflip](https://imgflip.com/api) diff --git a/meme/micro.mu b/meme/micro.mu deleted file mode 100644 index 4db8419..0000000 --- a/meme/micro.mu +++ /dev/null @@ -1 +0,0 @@ -service meme diff --git a/meme/publicapi.json b/meme/publicapi.json deleted file mode 100644 index b7768ec..0000000 --- a/meme/publicapi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "meme", - "icon": "🤦", - "category": "social", - "display_name": "Meme Generator" -} diff --git a/memegen/.gitignore b/memegen/.gitignore new file mode 100644 index 0000000..91b4d39 --- /dev/null +++ b/memegen/.gitignore @@ -0,0 +1,2 @@ + +memegen diff --git a/memegen/Dockerfile b/memegen/Dockerfile new file mode 100644 index 0000000..cb2ba93 --- /dev/null +++ b/memegen/Dockerfile @@ -0,0 +1,3 @@ +FROM alpine +ADD memegen /memegen +ENTRYPOINT [ "/memegen" ] diff --git a/meme/Makefile b/memegen/Makefile similarity index 66% rename from meme/Makefile rename to memegen/Makefile index 63c9005..7be15d5 100644 --- a/meme/Makefile +++ b/memegen/Makefile @@ -8,15 +8,15 @@ init: .PHONY: api api: - protoc --openapi_out=. --proto_path=. proto/meme.proto + protoc --openapi_out=. --proto_path=. proto/memegen.proto .PHONY: proto proto: - protoc --proto_path=. --micro_out=. --go_out=:. proto/meme.proto + protoc --proto_path=. --micro_out=. --go_out=:. proto/memegen.proto .PHONY: build build: - go build -o meme *.go + go build -o memegen *.go .PHONY: test test: @@ -24,4 +24,4 @@ test: .PHONY: docker docker: - docker build . -t meme:latest + docker build . -t memegen:latest diff --git a/memegen/README.md b/memegen/README.md new file mode 100644 index 0000000..00c151c --- /dev/null +++ b/memegen/README.md @@ -0,0 +1,7 @@ +Memegen generator + +# Memegen Service + +Generate memegen. That's it. + +Powered by [Imgflip](https://imgflip.com/api) diff --git a/meme/examples.json b/memegen/examples.json similarity index 84% rename from meme/examples.json rename to memegen/examples.json index f7e0b33..a3ee1e9 100644 --- a/meme/examples.json +++ b/memegen/examples.json @@ -1,8 +1,8 @@ { "templates": [{ - "title": "Meme templates", - "description": "List of meme templates", + "title": "Memegen templates", + "description": "List of memegen templates", "run_check": false, "request": {}, "response": { @@ -27,8 +27,8 @@ } }], "generate": [{ - "title": "Generate a meme", - "description": "Generate a meme from a template", + "title": "Generate a memegen", + "description": "Generate a memegen from a template", "run_check": false, "request": { "id": "444501", diff --git a/meme/generate.go b/memegen/generate.go similarity index 100% rename from meme/generate.go rename to memegen/generate.go diff --git a/meme/handler/meme.go b/memegen/handler/memegen.go similarity index 76% rename from meme/handler/meme.go rename to memegen/handler/memegen.go index cfbcc74..8a1e6f9 100644 --- a/meme/handler/meme.go +++ b/memegen/handler/memegen.go @@ -10,16 +10,16 @@ import ( "github.com/micro/micro/v3/service/config" "github.com/micro/micro/v3/service/errors" "github.com/micro/micro/v3/service/logger" - pb "github.com/micro/services/meme/proto" + pb "github.com/micro/services/memegen/proto" "github.com/micro/services/pkg/api" ) -type Meme struct { +type Memegen struct { username string password string } -func New() *Meme { +func New() *Memegen { v, err := config.Get("imgflip.username") if err != nil { logger.Fatalf("imgflip.username config not found: %v", err) @@ -36,7 +36,7 @@ func New() *Meme { if len(password) == 0 { logger.Fatal("imgflip.password config not found") } - return &Meme{ + return &Memegen{ username: username, password: password, } @@ -51,16 +51,16 @@ type Data struct { Memes []*pb.Template `json:"memes"` } -func (m *Meme) Templates(ctx context.Context, req *pb.TemplatesRequest, rsp *pb.TemplatesResponse) error { +func (m *Memegen) Templates(ctx context.Context, req *pb.TemplatesRequest, rsp *pb.TemplatesResponse) error { templateRsp := new(TemplateRequest) if err := api.Get("https://api.imgflip.com/get_memes", templateRsp); err != nil { - return errors.InternalServerError("meme.templates", err.Error()) + return errors.InternalServerError("memegen.templates", err.Error()) } rsp.Templates = templateRsp.Data.Memes return nil } -func (m *Meme) Generate(ctx context.Context, req *pb.GenerateRequest, rsp *pb.GenerateResponse) error { +func (m *Memegen) Generate(ctx context.Context, req *pb.GenerateRequest, rsp *pb.GenerateResponse) error { vals := url.Values{} vals.Set("template_id", req.Id) vals.Set("text0", req.TopText) @@ -74,7 +74,7 @@ func (m *Meme) Generate(ctx context.Context, req *pb.GenerateRequest, rsp *pb.Ge resp, err := http.PostForm("https://api.imgflip.com/caption_image", vals) if err != nil { - return errors.InternalServerError("meme.generate", err.Error()) + return errors.InternalServerError("memegen.generate", err.Error()) } defer resp.Body.Close() @@ -83,7 +83,7 @@ func (m *Meme) Generate(ctx context.Context, req *pb.GenerateRequest, rsp *pb.Ge success := genRsp["success"].(bool) if !success { - return errors.BadRequest("meme.generate", genRsp["error_message"].(string)) + return errors.BadRequest("memegen.generate", genRsp["error_message"].(string)) } // set response url diff --git a/meme/main.go b/memegen/main.go similarity index 62% rename from meme/main.go rename to memegen/main.go index 375b503..8fd4bba 100644 --- a/meme/main.go +++ b/memegen/main.go @@ -3,19 +3,19 @@ package main import ( "github.com/micro/micro/v3/service" "github.com/micro/micro/v3/service/logger" - "github.com/micro/services/meme/handler" - pb "github.com/micro/services/meme/proto" + "github.com/micro/services/memegen/handler" + pb "github.com/micro/services/memegen/proto" ) func main() { // Create service srv := service.New( - service.Name("meme"), + service.Name("memegen"), service.Version("latest"), ) // Register handler - pb.RegisterMemeHandler(srv.Server(), handler.New()) + pb.RegisterMemegenHandler(srv.Server(), handler.New()) // Run service if err := srv.Run(); err != nil { diff --git a/memegen/micro.mu b/memegen/micro.mu new file mode 100644 index 0000000..fbb6dcd --- /dev/null +++ b/memegen/micro.mu @@ -0,0 +1 @@ +service memegen diff --git a/meme/proto/meme.pb.go b/memegen/proto/memegen.pb.go similarity index 58% rename from meme/proto/meme.pb.go rename to memegen/proto/memegen.pb.go index 0f14d22..688097b 100644 --- a/meme/proto/meme.pb.go +++ b/memegen/proto/memegen.pb.go @@ -2,9 +2,9 @@ // versions: // protoc-gen-go v1.27.1 // protoc v3.15.6 -// source: proto/meme.proto +// source: proto/memegen.proto -package meme +package memegen import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -25,11 +25,11 @@ type Template struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // id of the meme + // id of the memegen Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - // name of the meme + // name of the memegen Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - // url of the meme + // url of the memegen Url string `protobuf:"bytes,3,opt,name=url,proto3" json:"url,omitempty"` // width in pixels Width int32 `protobuf:"varint,4,opt,name=width,proto3" json:"width,omitempty"` @@ -42,7 +42,7 @@ type Template struct { func (x *Template) Reset() { *x = Template{} if protoimpl.UnsafeEnabled { - mi := &file_proto_meme_proto_msgTypes[0] + mi := &file_proto_memegen_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -55,7 +55,7 @@ func (x *Template) String() string { func (*Template) ProtoMessage() {} func (x *Template) ProtoReflect() protoreflect.Message { - mi := &file_proto_meme_proto_msgTypes[0] + mi := &file_proto_memegen_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -68,7 +68,7 @@ func (x *Template) ProtoReflect() protoreflect.Message { // Deprecated: Use Template.ProtoReflect.Descriptor instead. func (*Template) Descriptor() ([]byte, []int) { - return file_proto_meme_proto_rawDescGZIP(), []int{0} + return file_proto_memegen_proto_rawDescGZIP(), []int{0} } func (x *Template) GetId() string { @@ -137,7 +137,7 @@ type Box struct { func (x *Box) Reset() { *x = Box{} if protoimpl.UnsafeEnabled { - mi := &file_proto_meme_proto_msgTypes[1] + mi := &file_proto_memegen_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -150,7 +150,7 @@ func (x *Box) String() string { func (*Box) ProtoMessage() {} func (x *Box) ProtoReflect() protoreflect.Message { - mi := &file_proto_meme_proto_msgTypes[1] + mi := &file_proto_memegen_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -163,7 +163,7 @@ func (x *Box) ProtoReflect() protoreflect.Message { // Deprecated: Use Box.ProtoReflect.Descriptor instead. func (*Box) Descriptor() ([]byte, []int) { - return file_proto_meme_proto_rawDescGZIP(), []int{1} + return file_proto_memegen_proto_rawDescGZIP(), []int{1} } func (x *Box) GetText() string { @@ -225,7 +225,7 @@ type TemplatesRequest struct { func (x *TemplatesRequest) Reset() { *x = TemplatesRequest{} if protoimpl.UnsafeEnabled { - mi := &file_proto_meme_proto_msgTypes[2] + mi := &file_proto_memegen_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -238,7 +238,7 @@ func (x *TemplatesRequest) String() string { func (*TemplatesRequest) ProtoMessage() {} func (x *TemplatesRequest) ProtoReflect() protoreflect.Message { - mi := &file_proto_meme_proto_msgTypes[2] + mi := &file_proto_memegen_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -251,7 +251,7 @@ func (x *TemplatesRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use TemplatesRequest.ProtoReflect.Descriptor instead. func (*TemplatesRequest) Descriptor() ([]byte, []int) { - return file_proto_meme_proto_rawDescGZIP(), []int{2} + return file_proto_memegen_proto_rawDescGZIP(), []int{2} } type TemplatesResponse struct { @@ -265,7 +265,7 @@ type TemplatesResponse struct { func (x *TemplatesResponse) Reset() { *x = TemplatesResponse{} if protoimpl.UnsafeEnabled { - mi := &file_proto_meme_proto_msgTypes[3] + mi := &file_proto_memegen_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -278,7 +278,7 @@ func (x *TemplatesResponse) String() string { func (*TemplatesResponse) ProtoMessage() {} func (x *TemplatesResponse) ProtoReflect() protoreflect.Message { - mi := &file_proto_meme_proto_msgTypes[3] + mi := &file_proto_memegen_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -291,7 +291,7 @@ func (x *TemplatesResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use TemplatesResponse.ProtoReflect.Descriptor instead. func (*TemplatesResponse) Descriptor() ([]byte, []int) { - return file_proto_meme_proto_rawDescGZIP(), []int{3} + return file_proto_memegen_proto_rawDescGZIP(), []int{3} } func (x *TemplatesResponse) GetTemplates() []*Template { @@ -321,7 +321,7 @@ type GenerateRequest struct { func (x *GenerateRequest) Reset() { *x = GenerateRequest{} if protoimpl.UnsafeEnabled { - mi := &file_proto_meme_proto_msgTypes[4] + mi := &file_proto_memegen_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -334,7 +334,7 @@ func (x *GenerateRequest) String() string { func (*GenerateRequest) ProtoMessage() {} func (x *GenerateRequest) ProtoReflect() protoreflect.Message { - mi := &file_proto_meme_proto_msgTypes[4] + mi := &file_proto_memegen_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -347,7 +347,7 @@ func (x *GenerateRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GenerateRequest.ProtoReflect.Descriptor instead. func (*GenerateRequest) Descriptor() ([]byte, []int) { - return file_proto_meme_proto_rawDescGZIP(), []int{4} + return file_proto_memegen_proto_rawDescGZIP(), []int{4} } func (x *GenerateRequest) GetId() string { @@ -390,14 +390,14 @@ type GenerateResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // url of the meme + // url of the memegen Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"` } func (x *GenerateResponse) Reset() { *x = GenerateResponse{} if protoimpl.UnsafeEnabled { - mi := &file_proto_meme_proto_msgTypes[5] + mi := &file_proto_memegen_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -410,7 +410,7 @@ func (x *GenerateResponse) String() string { func (*GenerateResponse) ProtoMessage() {} func (x *GenerateResponse) ProtoReflect() protoreflect.Message { - mi := &file_proto_meme_proto_msgTypes[5] + mi := &file_proto_memegen_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -423,7 +423,7 @@ func (x *GenerateResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GenerateResponse.ProtoReflect.Descriptor instead. func (*GenerateResponse) Descriptor() ([]byte, []int) { - return file_proto_meme_proto_rawDescGZIP(), []int{5} + return file_proto_memegen_proto_rawDescGZIP(), []int{5} } func (x *GenerateResponse) GetUrl() string { @@ -433,85 +433,87 @@ func (x *GenerateResponse) GetUrl() string { return "" } -var File_proto_meme_proto protoreflect.FileDescriptor +var File_proto_memegen_proto protoreflect.FileDescriptor -var file_proto_meme_proto_rawDesc = []byte{ - 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x65, 0x6d, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x04, 0x6d, 0x65, 0x6d, 0x65, 0x22, 0x8b, 0x01, 0x0a, 0x08, 0x54, 0x65, 0x6d, - 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, - 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x62, 0x6f, 0x78, - 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, - 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x93, 0x01, 0x0a, 0x03, 0x42, 0x6f, 0x78, 0x12, 0x12, - 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x65, - 0x78, 0x74, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x78, - 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x77, - 0x69, 0x64, 0x74, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, - 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f, 0x6c, - 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x12, 0x0a, 0x10, - 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x22, 0x41, 0x0a, 0x11, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2c, 0x0a, 0x09, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, - 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6d, 0x65, 0x6d, 0x65, 0x2e, - 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x09, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, - 0x74, 0x65, 0x73, 0x22, 0x95, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x6f, 0x70, 0x5f, 0x74, - 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x6f, 0x70, 0x54, 0x65, - 0x78, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x74, 0x65, 0x78, - 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x54, - 0x65, 0x78, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6f, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x66, 0x6f, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0d, 0x6d, 0x61, 0x78, 0x5f, 0x66, - 0x6f, 0x6e, 0x74, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, - 0x6d, 0x61, 0x78, 0x46, 0x6f, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x47, - 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, - 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, - 0x6c, 0x32, 0x83, 0x01, 0x0a, 0x04, 0x4d, 0x65, 0x6d, 0x65, 0x12, 0x3e, 0x0a, 0x09, 0x54, 0x65, - 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x12, 0x16, 0x2e, 0x6d, 0x65, 0x6d, 0x65, 0x2e, 0x54, - 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x17, 0x2e, 0x6d, 0x65, 0x6d, 0x65, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3b, 0x0a, 0x08, 0x47, 0x65, - 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x12, 0x15, 0x2e, 0x6d, 0x65, 0x6d, 0x65, 0x2e, 0x47, 0x65, - 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, - 0x6d, 0x65, 0x6d, 0x65, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x3b, 0x6d, 0x65, 0x6d, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_proto_memegen_proto_rawDesc = []byte{ + 0x0a, 0x13, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6d, 0x65, 0x6d, 0x65, 0x67, 0x65, 0x6e, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x6d, 0x65, 0x6d, 0x65, 0x67, 0x65, 0x6e, 0x22, 0x8b, + 0x01, 0x0a, 0x08, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, + 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, + 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, + 0x1b, 0x0a, 0x09, 0x62, 0x6f, 0x78, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x93, 0x01, 0x0a, + 0x03, 0x42, 0x6f, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x01, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x6c, + 0x69, 0x6e, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x44, 0x0a, 0x11, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, + 0x74, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x74, + 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, + 0x2e, 0x6d, 0x65, 0x6d, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, + 0x65, 0x52, 0x09, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x22, 0x95, 0x01, 0x0a, + 0x0f, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x19, 0x0a, 0x08, 0x74, 0x6f, 0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x74, 0x6f, 0x70, 0x54, 0x65, 0x78, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x54, 0x65, 0x78, 0x74, 0x12, 0x12, 0x0a, 0x04, + 0x66, 0x6f, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x6f, 0x6e, 0x74, + 0x12, 0x22, 0x0a, 0x0d, 0x6d, 0x61, 0x78, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x73, 0x69, 0x7a, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x46, 0x6f, 0x6e, 0x74, + 0x53, 0x69, 0x7a, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x32, 0x92, 0x01, 0x0a, 0x07, 0x4d, + 0x65, 0x6d, 0x65, 0x67, 0x65, 0x6e, 0x12, 0x44, 0x0a, 0x09, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, + 0x74, 0x65, 0x73, 0x12, 0x19, 0x2e, 0x6d, 0x65, 0x6d, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x54, 0x65, + 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, + 0x2e, 0x6d, 0x65, 0x6d, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x54, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, + 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x08, + 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x12, 0x18, 0x2e, 0x6d, 0x65, 0x6d, 0x65, 0x67, + 0x65, 0x6e, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x6d, 0x65, 0x6d, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x47, 0x65, 0x6e, + 0x65, 0x72, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, + 0x11, 0x5a, 0x0f, 0x2e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x6d, 0x65, 0x6d, 0x65, 0x67, + 0x65, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_proto_meme_proto_rawDescOnce sync.Once - file_proto_meme_proto_rawDescData = file_proto_meme_proto_rawDesc + file_proto_memegen_proto_rawDescOnce sync.Once + file_proto_memegen_proto_rawDescData = file_proto_memegen_proto_rawDesc ) -func file_proto_meme_proto_rawDescGZIP() []byte { - file_proto_meme_proto_rawDescOnce.Do(func() { - file_proto_meme_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_meme_proto_rawDescData) +func file_proto_memegen_proto_rawDescGZIP() []byte { + file_proto_memegen_proto_rawDescOnce.Do(func() { + file_proto_memegen_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_memegen_proto_rawDescData) }) - return file_proto_meme_proto_rawDescData + return file_proto_memegen_proto_rawDescData } -var file_proto_meme_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_proto_meme_proto_goTypes = []interface{}{ - (*Template)(nil), // 0: meme.Template - (*Box)(nil), // 1: meme.Box - (*TemplatesRequest)(nil), // 2: meme.TemplatesRequest - (*TemplatesResponse)(nil), // 3: meme.TemplatesResponse - (*GenerateRequest)(nil), // 4: meme.GenerateRequest - (*GenerateResponse)(nil), // 5: meme.GenerateResponse +var file_proto_memegen_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_proto_memegen_proto_goTypes = []interface{}{ + (*Template)(nil), // 0: memegen.Template + (*Box)(nil), // 1: memegen.Box + (*TemplatesRequest)(nil), // 2: memegen.TemplatesRequest + (*TemplatesResponse)(nil), // 3: memegen.TemplatesResponse + (*GenerateRequest)(nil), // 4: memegen.GenerateRequest + (*GenerateResponse)(nil), // 5: memegen.GenerateResponse } -var file_proto_meme_proto_depIdxs = []int32{ - 0, // 0: meme.TemplatesResponse.templates:type_name -> meme.Template - 2, // 1: meme.Meme.Templates:input_type -> meme.TemplatesRequest - 4, // 2: meme.Meme.Generate:input_type -> meme.GenerateRequest - 3, // 3: meme.Meme.Templates:output_type -> meme.TemplatesResponse - 5, // 4: meme.Meme.Generate:output_type -> meme.GenerateResponse +var file_proto_memegen_proto_depIdxs = []int32{ + 0, // 0: memegen.TemplatesResponse.templates:type_name -> memegen.Template + 2, // 1: memegen.Memegen.Templates:input_type -> memegen.TemplatesRequest + 4, // 2: memegen.Memegen.Generate:input_type -> memegen.GenerateRequest + 3, // 3: memegen.Memegen.Templates:output_type -> memegen.TemplatesResponse + 5, // 4: memegen.Memegen.Generate:output_type -> memegen.GenerateResponse 3, // [3:5] is the sub-list for method output_type 1, // [1:3] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -519,13 +521,13 @@ var file_proto_meme_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_proto_meme_proto_init() } -func file_proto_meme_proto_init() { - if File_proto_meme_proto != nil { +func init() { file_proto_memegen_proto_init() } +func file_proto_memegen_proto_init() { + if File_proto_memegen_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_proto_meme_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_proto_memegen_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Template); i { case 0: return &v.state @@ -537,7 +539,7 @@ func file_proto_meme_proto_init() { return nil } } - file_proto_meme_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_proto_memegen_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Box); i { case 0: return &v.state @@ -549,7 +551,7 @@ func file_proto_meme_proto_init() { return nil } } - file_proto_meme_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_proto_memegen_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TemplatesRequest); i { case 0: return &v.state @@ -561,7 +563,7 @@ func file_proto_meme_proto_init() { return nil } } - file_proto_meme_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_proto_memegen_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TemplatesResponse); i { case 0: return &v.state @@ -573,7 +575,7 @@ func file_proto_meme_proto_init() { return nil } } - file_proto_meme_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_proto_memegen_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GenerateRequest); i { case 0: return &v.state @@ -585,7 +587,7 @@ func file_proto_meme_proto_init() { return nil } } - file_proto_meme_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_proto_memegen_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GenerateResponse); i { case 0: return &v.state @@ -602,18 +604,18 @@ func file_proto_meme_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_proto_meme_proto_rawDesc, + RawDescriptor: file_proto_memegen_proto_rawDesc, NumEnums: 0, NumMessages: 6, NumExtensions: 0, NumServices: 1, }, - GoTypes: file_proto_meme_proto_goTypes, - DependencyIndexes: file_proto_meme_proto_depIdxs, - MessageInfos: file_proto_meme_proto_msgTypes, + GoTypes: file_proto_memegen_proto_goTypes, + DependencyIndexes: file_proto_memegen_proto_depIdxs, + MessageInfos: file_proto_memegen_proto_msgTypes, }.Build() - File_proto_meme_proto = out.File - file_proto_meme_proto_rawDesc = nil - file_proto_meme_proto_goTypes = nil - file_proto_meme_proto_depIdxs = nil + File_proto_memegen_proto = out.File + file_proto_memegen_proto_rawDesc = nil + file_proto_memegen_proto_goTypes = nil + file_proto_memegen_proto_depIdxs = nil } diff --git a/meme/proto/meme.pb.micro.go b/memegen/proto/memegen.pb.micro.go similarity index 57% rename from meme/proto/meme.pb.micro.go rename to memegen/proto/memegen.pb.micro.go index 967542a..4dd36ed 100644 --- a/meme/proto/meme.pb.micro.go +++ b/memegen/proto/memegen.pb.micro.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-micro. DO NOT EDIT. -// source: proto/meme.proto +// source: proto/memegen.proto -package meme +package memegen import ( fmt "fmt" @@ -33,33 +33,33 @@ var _ context.Context var _ client.Option var _ server.Option -// Api Endpoints for Meme service +// Api Endpoints for Memegen service -func NewMemeEndpoints() []*api.Endpoint { +func NewMemegenEndpoints() []*api.Endpoint { return []*api.Endpoint{} } -// Client API for Meme service +// Client API for Memegen service -type MemeService interface { +type MemegenService interface { Templates(ctx context.Context, in *TemplatesRequest, opts ...client.CallOption) (*TemplatesResponse, error) Generate(ctx context.Context, in *GenerateRequest, opts ...client.CallOption) (*GenerateResponse, error) } -type memeService struct { +type memegenService struct { c client.Client name string } -func NewMemeService(name string, c client.Client) MemeService { - return &memeService{ +func NewMemegenService(name string, c client.Client) MemegenService { + return &memegenService{ c: c, name: name, } } -func (c *memeService) Templates(ctx context.Context, in *TemplatesRequest, opts ...client.CallOption) (*TemplatesResponse, error) { - req := c.c.NewRequest(c.name, "Meme.Templates", in) +func (c *memegenService) Templates(ctx context.Context, in *TemplatesRequest, opts ...client.CallOption) (*TemplatesResponse, error) { + req := c.c.NewRequest(c.name, "Memegen.Templates", in) out := new(TemplatesResponse) err := c.c.Call(ctx, req, out, opts...) if err != nil { @@ -68,8 +68,8 @@ func (c *memeService) Templates(ctx context.Context, in *TemplatesRequest, opts return out, nil } -func (c *memeService) Generate(ctx context.Context, in *GenerateRequest, opts ...client.CallOption) (*GenerateResponse, error) { - req := c.c.NewRequest(c.name, "Meme.Generate", in) +func (c *memegenService) Generate(ctx context.Context, in *GenerateRequest, opts ...client.CallOption) (*GenerateResponse, error) { + req := c.c.NewRequest(c.name, "Memegen.Generate", in) out := new(GenerateResponse) err := c.c.Call(ctx, req, out, opts...) if err != nil { @@ -78,33 +78,33 @@ func (c *memeService) Generate(ctx context.Context, in *GenerateRequest, opts .. return out, nil } -// Server API for Meme service +// Server API for Memegen service -type MemeHandler interface { +type MemegenHandler interface { Templates(context.Context, *TemplatesRequest, *TemplatesResponse) error Generate(context.Context, *GenerateRequest, *GenerateResponse) error } -func RegisterMemeHandler(s server.Server, hdlr MemeHandler, opts ...server.HandlerOption) error { - type meme interface { +func RegisterMemegenHandler(s server.Server, hdlr MemegenHandler, opts ...server.HandlerOption) error { + type memegen interface { Templates(ctx context.Context, in *TemplatesRequest, out *TemplatesResponse) error Generate(ctx context.Context, in *GenerateRequest, out *GenerateResponse) error } - type Meme struct { - meme + type Memegen struct { + memegen } - h := &memeHandler{hdlr} - return s.Handle(s.NewHandler(&Meme{h}, opts...)) + h := &memegenHandler{hdlr} + return s.Handle(s.NewHandler(&Memegen{h}, opts...)) } -type memeHandler struct { - MemeHandler +type memegenHandler struct { + MemegenHandler } -func (h *memeHandler) Templates(ctx context.Context, in *TemplatesRequest, out *TemplatesResponse) error { - return h.MemeHandler.Templates(ctx, in, out) +func (h *memegenHandler) Templates(ctx context.Context, in *TemplatesRequest, out *TemplatesResponse) error { + return h.MemegenHandler.Templates(ctx, in, out) } -func (h *memeHandler) Generate(ctx context.Context, in *GenerateRequest, out *GenerateResponse) error { - return h.MemeHandler.Generate(ctx, in, out) +func (h *memegenHandler) Generate(ctx context.Context, in *GenerateRequest, out *GenerateResponse) error { + return h.MemegenHandler.Generate(ctx, in, out) } diff --git a/meme/proto/meme.proto b/memegen/proto/memegen.proto similarity index 86% rename from meme/proto/meme.proto rename to memegen/proto/memegen.proto index e03a6db..d793a85 100644 --- a/meme/proto/meme.proto +++ b/memegen/proto/memegen.proto @@ -1,20 +1,20 @@ syntax = "proto3"; -package meme; +package memegen; -option go_package = "./proto;meme"; +option go_package = "./proto;memegen"; -service Meme { +service Memegen { rpc Templates(TemplatesRequest) returns (TemplatesResponse) {} rpc Generate(GenerateRequest) returns (GenerateResponse) {} } message Template { - // id of the meme + // id of the memegen string id = 1; - // name of the meme + // name of the memegen string name = 2; - // url of the meme + // url of the memegen string url = 3; // width in pixels int32 width = 4; @@ -62,7 +62,7 @@ message GenerateRequest { } message GenerateResponse { - // url of the meme + // url of the memegen string url = 1; } diff --git a/memegen/publicapi.json b/memegen/publicapi.json new file mode 100644 index 0000000..3a074a2 --- /dev/null +++ b/memegen/publicapi.json @@ -0,0 +1,6 @@ +{ + "name": "memegen", + "icon": "🤦", + "category": "social", + "display_name": "Memegen Generator" +}