From c823d4ace04f9556914d75fee479ee04ad32aee9 Mon Sep 17 00:00:00 2001 From: Manfred Touron Date: Tue, 15 Jan 2019 12:15:17 +0100 Subject: [PATCH] feat: add swagger output + bump generators --- Makefile | 14 +- api/api.pb.go | 321 ++++++----- api/api.pb.gw.go | 18 +- apidocs.swagger.json | 922 ++++++++++++++++++++++++++++++++ go.mod | 4 +- pkg/crew/crew.pb.go | 126 ++--- pkg/soundcloud/soundcloud.pb.go | 257 +++++---- 7 files changed, 1301 insertions(+), 361 deletions(-) create mode 100644 apidocs.swagger.json diff --git a/Makefile b/Makefile index 3e33446a..a457c821 100644 --- a/Makefile +++ b/Makefile @@ -11,13 +11,15 @@ rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subs GOPATH ?= $(HOME)/go BIN = $(GOPATH)/bin/calcbiz SOURCES = $(call rwildcard, ./, *.go) -OUR_SOURCES = $(filter-out $(call rwildcard,vendor//,*.go),$(SOURCES)) +OUR_SOURCES = $(filter-out $(call rwildcard,./vendor,*.go),$(SOURCES)) PROTOS = $(call rwildcard, ./, *.proto) -OUR_PROTOS = $(filter-out $(call rwildcard,vendor//,*.proto),$(PROTOS)) +OUR_PROTOS = $(filter-out $(call rwildcard,./vendor,*.proto),$(PROTOS)) GENERATED_FILES = \ $(patsubst %.proto,%.pb.go,$(PROTOS)) \ $(call rwildcard .//, *.gen.go) \ - $(call rwildcard .//, *.pb.gw.go) + $(call rwildcard .//, *.pb.gw.go) \ + apidocs.swagger.json + PROTOC_OPTS = -I/protobuf:vendor:. RUN_OPTS ?= @@ -88,6 +90,12 @@ test: .generated --gogofaster_out=plugins=grpc:"$(GOPATH)/src" \ "$(dir $<)"/*.proto +apidocs.swagger.json: $(OUR_PROTOS) + protoc \ + $(PROTOC_OPTS) \ + --swagger_out=allow_merge=true:. \ + ./api/api.proto + .PHONY: lint lint: golangci-lint run --verbose ./... diff --git a/api/api.pb.go b/api/api.pb.go index 41b4318f..19dc4bf9 100644 --- a/api/api.pb.go +++ b/api/api.pb.go @@ -1,25 +1,22 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: api/api.proto -package api // import "ultre.me/calcbiz/api" - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import _ "google.golang.org/genproto/googleapis/api/annotations" -import crew "ultre.me/calcbiz/pkg/crew" -import soundcloud "ultre.me/calcbiz/pkg/soundcloud" +package api import ( - context "golang.org/x/net/context" + context "context" + encoding_binary "encoding/binary" + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" + io "io" + math "math" + crew "ultre.me/calcbiz/pkg/crew" + soundcloud "ultre.me/calcbiz/pkg/soundcloud" ) -import encoding_binary "encoding/binary" - -import io "io" - // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf @@ -38,7 +35,7 @@ func (m *Void) Reset() { *m = Void{} } func (m *Void) String() string { return proto.CompactTextString(m) } func (*Void) ProtoMessage() {} func (*Void) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{0} + return fileDescriptor_1b40cafcd4234784, []int{0} } func (m *Void) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -55,8 +52,8 @@ func (m *Void) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Void) XXX_Merge(src proto.Message) { - xxx_messageInfo_Void.Merge(dst, src) +func (m *Void) XXX_Merge(src proto.Message) { + xxx_messageInfo_Void.Merge(m, src) } func (m *Void) XXX_Size() int { return m.Size() @@ -75,7 +72,7 @@ func (m *Pong) Reset() { *m = Pong{} } func (m *Pong) String() string { return proto.CompactTextString(m) } func (*Pong) ProtoMessage() {} func (*Pong) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{1} + return fileDescriptor_1b40cafcd4234784, []int{1} } func (m *Pong) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -92,8 +89,8 @@ func (m *Pong) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Pong) XXX_Merge(src proto.Message) { - xxx_messageInfo_Pong.Merge(dst, src) +func (m *Pong) XXX_Merge(src proto.Message) { + xxx_messageInfo_Pong.Merge(m, src) } func (m *Pong) XXX_Size() int { return m.Size() @@ -119,7 +116,7 @@ func (m *KryptosInput) Reset() { *m = KryptosInput{} } func (m *KryptosInput) String() string { return proto.CompactTextString(m) } func (*KryptosInput) ProtoMessage() {} func (*KryptosInput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{2} + return fileDescriptor_1b40cafcd4234784, []int{2} } func (m *KryptosInput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -136,8 +133,8 @@ func (m *KryptosInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (dst *KryptosInput) XXX_Merge(src proto.Message) { - xxx_messageInfo_KryptosInput.Merge(dst, src) +func (m *KryptosInput) XXX_Merge(src proto.Message) { + xxx_messageInfo_KryptosInput.Merge(m, src) } func (m *KryptosInput) XXX_Size() int { return m.Size() @@ -163,7 +160,7 @@ func (m *KryptosOutput) Reset() { *m = KryptosOutput{} } func (m *KryptosOutput) String() string { return proto.CompactTextString(m) } func (*KryptosOutput) ProtoMessage() {} func (*KryptosOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{3} + return fileDescriptor_1b40cafcd4234784, []int{3} } func (m *KryptosOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -180,8 +177,8 @@ func (m *KryptosOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error return b[:n], nil } } -func (dst *KryptosOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_KryptosOutput.Merge(dst, src) +func (m *KryptosOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_KryptosOutput.Merge(m, src) } func (m *KryptosOutput) XXX_Size() int { return m.Size() @@ -207,7 +204,7 @@ func (m *TpyoEnocdeIpunt) Reset() { *m = TpyoEnocdeIpunt{} } func (m *TpyoEnocdeIpunt) String() string { return proto.CompactTextString(m) } func (*TpyoEnocdeIpunt) ProtoMessage() {} func (*TpyoEnocdeIpunt) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{4} + return fileDescriptor_1b40cafcd4234784, []int{4} } func (m *TpyoEnocdeIpunt) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,8 +221,8 @@ func (m *TpyoEnocdeIpunt) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (dst *TpyoEnocdeIpunt) XXX_Merge(src proto.Message) { - xxx_messageInfo_TpyoEnocdeIpunt.Merge(dst, src) +func (m *TpyoEnocdeIpunt) XXX_Merge(src proto.Message) { + xxx_messageInfo_TpyoEnocdeIpunt.Merge(m, src) } func (m *TpyoEnocdeIpunt) XXX_Size() int { return m.Size() @@ -251,7 +248,7 @@ func (m *TpyoEnocdeOuptut) Reset() { *m = TpyoEnocdeOuptut{} } func (m *TpyoEnocdeOuptut) String() string { return proto.CompactTextString(m) } func (*TpyoEnocdeOuptut) ProtoMessage() {} func (*TpyoEnocdeOuptut) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{5} + return fileDescriptor_1b40cafcd4234784, []int{5} } func (m *TpyoEnocdeOuptut) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -268,8 +265,8 @@ func (m *TpyoEnocdeOuptut) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (dst *TpyoEnocdeOuptut) XXX_Merge(src proto.Message) { - xxx_messageInfo_TpyoEnocdeOuptut.Merge(dst, src) +func (m *TpyoEnocdeOuptut) XXX_Merge(src proto.Message) { + xxx_messageInfo_TpyoEnocdeOuptut.Merge(m, src) } func (m *TpyoEnocdeOuptut) XXX_Size() int { return m.Size() @@ -294,7 +291,7 @@ func (m *DahsboardRandomOutput) Reset() { *m = DahsboardRandomOutput{} } func (m *DahsboardRandomOutput) String() string { return proto.CompactTextString(m) } func (*DahsboardRandomOutput) ProtoMessage() {} func (*DahsboardRandomOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{6} + return fileDescriptor_1b40cafcd4234784, []int{6} } func (m *DahsboardRandomOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -311,8 +308,8 @@ func (m *DahsboardRandomOutput) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (dst *DahsboardRandomOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_DahsboardRandomOutput.Merge(dst, src) +func (m *DahsboardRandomOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_DahsboardRandomOutput.Merge(m, src) } func (m *DahsboardRandomOutput) XXX_Size() int { return m.Size() @@ -331,7 +328,7 @@ func (m *NumberinfoInput) Reset() { *m = NumberinfoInput{} } func (m *NumberinfoInput) String() string { return proto.CompactTextString(m) } func (*NumberinfoInput) ProtoMessage() {} func (*NumberinfoInput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{7} + return fileDescriptor_1b40cafcd4234784, []int{7} } func (m *NumberinfoInput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -348,8 +345,8 @@ func (m *NumberinfoInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (dst *NumberinfoInput) XXX_Merge(src proto.Message) { - xxx_messageInfo_NumberinfoInput.Merge(dst, src) +func (m *NumberinfoInput) XXX_Merge(src proto.Message) { + xxx_messageInfo_NumberinfoInput.Merge(m, src) } func (m *NumberinfoInput) XXX_Size() int { return m.Size() @@ -368,14 +365,14 @@ func (m *NumberinfoInput) GetNumber() float32 { } type NumberinfoOutput struct { - Facts map[string]string `protobuf:"bytes,1,rep,name=facts" json:"facts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Facts map[string]string `protobuf:"bytes,1,rep,name=facts,proto3" json:"facts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (m *NumberinfoOutput) Reset() { *m = NumberinfoOutput{} } func (m *NumberinfoOutput) String() string { return proto.CompactTextString(m) } func (*NumberinfoOutput) ProtoMessage() {} func (*NumberinfoOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{8} + return fileDescriptor_1b40cafcd4234784, []int{8} } func (m *NumberinfoOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -392,8 +389,8 @@ func (m *NumberinfoOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (dst *NumberinfoOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_NumberinfoOutput.Merge(dst, src) +func (m *NumberinfoOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_NumberinfoOutput.Merge(m, src) } func (m *NumberinfoOutput) XXX_Size() int { return m.Size() @@ -412,14 +409,14 @@ func (m *NumberinfoOutput) GetFacts() map[string]string { } type MoijaimeOutput struct { - Kiffs []string `protobuf:"bytes,1,rep,name=kiffs" json:"kiffs,omitempty"` + Kiffs []string `protobuf:"bytes,1,rep,name=kiffs,proto3" json:"kiffs,omitempty"` } func (m *MoijaimeOutput) Reset() { *m = MoijaimeOutput{} } func (m *MoijaimeOutput) String() string { return proto.CompactTextString(m) } func (*MoijaimeOutput) ProtoMessage() {} func (*MoijaimeOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{9} + return fileDescriptor_1b40cafcd4234784, []int{9} } func (m *MoijaimeOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -436,8 +433,8 @@ func (m *MoijaimeOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return b[:n], nil } } -func (dst *MoijaimeOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_MoijaimeOutput.Merge(dst, src) +func (m *MoijaimeOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_MoijaimeOutput.Merge(m, src) } func (m *MoijaimeOutput) XXX_Size() int { return m.Size() @@ -463,7 +460,7 @@ func (m *WotdOutput) Reset() { *m = WotdOutput{} } func (m *WotdOutput) String() string { return proto.CompactTextString(m) } func (*WotdOutput) ProtoMessage() {} func (*WotdOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{10} + return fileDescriptor_1b40cafcd4234784, []int{10} } func (m *WotdOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -480,8 +477,8 @@ func (m *WotdOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *WotdOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_WotdOutput.Merge(dst, src) +func (m *WotdOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_WotdOutput.Merge(m, src) } func (m *WotdOutput) XXX_Size() int { return m.Size() @@ -507,7 +504,7 @@ func (m *AlternateLogoOutput) Reset() { *m = AlternateLogoOutput{} } func (m *AlternateLogoOutput) String() string { return proto.CompactTextString(m) } func (*AlternateLogoOutput) ProtoMessage() {} func (*AlternateLogoOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{11} + return fileDescriptor_1b40cafcd4234784, []int{11} } func (m *AlternateLogoOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -524,8 +521,8 @@ func (m *AlternateLogoOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (dst *AlternateLogoOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_AlternateLogoOutput.Merge(dst, src) +func (m *AlternateLogoOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_AlternateLogoOutput.Merge(m, src) } func (m *AlternateLogoOutput) XXX_Size() int { return m.Size() @@ -550,7 +547,7 @@ func (m *DahsboardOutput) Reset() { *m = DahsboardOutput{} } func (m *DahsboardOutput) String() string { return proto.CompactTextString(m) } func (*DahsboardOutput) ProtoMessage() {} func (*DahsboardOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{12} + return fileDescriptor_1b40cafcd4234784, []int{12} } func (m *DahsboardOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -567,8 +564,8 @@ func (m *DahsboardOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (dst *DahsboardOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_DahsboardOutput.Merge(dst, src) +func (m *DahsboardOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_DahsboardOutput.Merge(m, src) } func (m *DahsboardOutput) XXX_Size() int { return m.Size() @@ -587,7 +584,7 @@ func (m *RecettatorInput) Reset() { *m = RecettatorInput{} } func (m *RecettatorInput) String() string { return proto.CompactTextString(m) } func (*RecettatorInput) ProtoMessage() {} func (*RecettatorInput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{13} + return fileDescriptor_1b40cafcd4234784, []int{13} } func (m *RecettatorInput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -604,8 +601,8 @@ func (m *RecettatorInput) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (dst *RecettatorInput) XXX_Merge(src proto.Message) { - xxx_messageInfo_RecettatorInput.Merge(dst, src) +func (m *RecettatorInput) XXX_Merge(src proto.Message) { + xxx_messageInfo_RecettatorInput.Merge(m, src) } func (m *RecettatorInput) XXX_Size() int { return m.Size() @@ -630,7 +627,7 @@ func (m *RecettatorOutput) Reset() { *m = RecettatorOutput{} } func (m *RecettatorOutput) String() string { return proto.CompactTextString(m) } func (*RecettatorOutput) ProtoMessage() {} func (*RecettatorOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{14} + return fileDescriptor_1b40cafcd4234784, []int{14} } func (m *RecettatorOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -647,8 +644,8 @@ func (m *RecettatorOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (dst *RecettatorOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_RecettatorOutput.Merge(dst, src) +func (m *RecettatorOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_RecettatorOutput.Merge(m, src) } func (m *RecettatorOutput) XXX_Size() int { return m.Size() @@ -666,7 +663,7 @@ func (m *DashboardOutput) Reset() { *m = DashboardOutput{} } func (m *DashboardOutput) String() string { return proto.CompactTextString(m) } func (*DashboardOutput) ProtoMessage() {} func (*DashboardOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{15} + return fileDescriptor_1b40cafcd4234784, []int{15} } func (m *DashboardOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -683,8 +680,8 @@ func (m *DashboardOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (dst *DashboardOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_DashboardOutput.Merge(dst, src) +func (m *DashboardOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_DashboardOutput.Merge(m, src) } func (m *DashboardOutput) XXX_Size() int { return m.Size() @@ -702,7 +699,7 @@ func (m *SpreadshirtRandomOutput) Reset() { *m = SpreadshirtRandomOutput func (m *SpreadshirtRandomOutput) String() string { return proto.CompactTextString(m) } func (*SpreadshirtRandomOutput) ProtoMessage() {} func (*SpreadshirtRandomOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{16} + return fileDescriptor_1b40cafcd4234784, []int{16} } func (m *SpreadshirtRandomOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -719,8 +716,8 @@ func (m *SpreadshirtRandomOutput) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (dst *SpreadshirtRandomOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_SpreadshirtRandomOutput.Merge(dst, src) +func (m *SpreadshirtRandomOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpreadshirtRandomOutput.Merge(m, src) } func (m *SpreadshirtRandomOutput) XXX_Size() int { return m.Size() @@ -738,7 +735,7 @@ func (m *SpreadshirtAllOutput) Reset() { *m = SpreadshirtAllOutput{} } func (m *SpreadshirtAllOutput) String() string { return proto.CompactTextString(m) } func (*SpreadshirtAllOutput) ProtoMessage() {} func (*SpreadshirtAllOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{17} + return fileDescriptor_1b40cafcd4234784, []int{17} } func (m *SpreadshirtAllOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -755,8 +752,8 @@ func (m *SpreadshirtAllOutput) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (dst *SpreadshirtAllOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_SpreadshirtAllOutput.Merge(dst, src) +func (m *SpreadshirtAllOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpreadshirtAllOutput.Merge(m, src) } func (m *SpreadshirtAllOutput) XXX_Size() int { return m.Size() @@ -774,7 +771,7 @@ func (m *SoundcloudPlaylistsOutput) Reset() { *m = SoundcloudPlaylistsOu func (m *SoundcloudPlaylistsOutput) String() string { return proto.CompactTextString(m) } func (*SoundcloudPlaylistsOutput) ProtoMessage() {} func (*SoundcloudPlaylistsOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{18} + return fileDescriptor_1b40cafcd4234784, []int{18} } func (m *SoundcloudPlaylistsOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -791,8 +788,8 @@ func (m *SoundcloudPlaylistsOutput) XXX_Marshal(b []byte, deterministic bool) ([ return b[:n], nil } } -func (dst *SoundcloudPlaylistsOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_SoundcloudPlaylistsOutput.Merge(dst, src) +func (m *SoundcloudPlaylistsOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_SoundcloudPlaylistsOutput.Merge(m, src) } func (m *SoundcloudPlaylistsOutput) XXX_Size() int { return m.Size() @@ -810,7 +807,7 @@ func (m *SoundcloudPlaylistOutput) Reset() { *m = SoundcloudPlaylistOutp func (m *SoundcloudPlaylistOutput) String() string { return proto.CompactTextString(m) } func (*SoundcloudPlaylistOutput) ProtoMessage() {} func (*SoundcloudPlaylistOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{19} + return fileDescriptor_1b40cafcd4234784, []int{19} } func (m *SoundcloudPlaylistOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -827,8 +824,8 @@ func (m *SoundcloudPlaylistOutput) XXX_Marshal(b []byte, deterministic bool) ([] return b[:n], nil } } -func (dst *SoundcloudPlaylistOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_SoundcloudPlaylistOutput.Merge(dst, src) +func (m *SoundcloudPlaylistOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_SoundcloudPlaylistOutput.Merge(m, src) } func (m *SoundcloudPlaylistOutput) XXX_Size() int { return m.Size() @@ -846,7 +843,7 @@ func (m *SoundcloudTracksOutput) Reset() { *m = SoundcloudTracksOutput{} func (m *SoundcloudTracksOutput) String() string { return proto.CompactTextString(m) } func (*SoundcloudTracksOutput) ProtoMessage() {} func (*SoundcloudTracksOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{20} + return fileDescriptor_1b40cafcd4234784, []int{20} } func (m *SoundcloudTracksOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -863,8 +860,8 @@ func (m *SoundcloudTracksOutput) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (dst *SoundcloudTracksOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_SoundcloudTracksOutput.Merge(dst, src) +func (m *SoundcloudTracksOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_SoundcloudTracksOutput.Merge(m, src) } func (m *SoundcloudTracksOutput) XXX_Size() int { return m.Size() @@ -882,7 +879,7 @@ func (m *SoundcloudTrackOutput) Reset() { *m = SoundcloudTrackOutput{} } func (m *SoundcloudTrackOutput) String() string { return proto.CompactTextString(m) } func (*SoundcloudTrackOutput) ProtoMessage() {} func (*SoundcloudTrackOutput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{21} + return fileDescriptor_1b40cafcd4234784, []int{21} } func (m *SoundcloudTrackOutput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -899,8 +896,8 @@ func (m *SoundcloudTrackOutput) XXX_Marshal(b []byte, deterministic bool) ([]byt return b[:n], nil } } -func (dst *SoundcloudTrackOutput) XXX_Merge(src proto.Message) { - xxx_messageInfo_SoundcloudTrackOutput.Merge(dst, src) +func (m *SoundcloudTrackOutput) XXX_Merge(src proto.Message) { + xxx_messageInfo_SoundcloudTrackOutput.Merge(m, src) } func (m *SoundcloudTrackOutput) XXX_Size() int { return m.Size() @@ -919,7 +916,7 @@ func (m *SoundcloudPlaylistInput) Reset() { *m = SoundcloudPlaylistInput func (m *SoundcloudPlaylistInput) String() string { return proto.CompactTextString(m) } func (*SoundcloudPlaylistInput) ProtoMessage() {} func (*SoundcloudPlaylistInput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{22} + return fileDescriptor_1b40cafcd4234784, []int{22} } func (m *SoundcloudPlaylistInput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -936,8 +933,8 @@ func (m *SoundcloudPlaylistInput) XXX_Marshal(b []byte, deterministic bool) ([]b return b[:n], nil } } -func (dst *SoundcloudPlaylistInput) XXX_Merge(src proto.Message) { - xxx_messageInfo_SoundcloudPlaylistInput.Merge(dst, src) +func (m *SoundcloudPlaylistInput) XXX_Merge(src proto.Message) { + xxx_messageInfo_SoundcloudPlaylistInput.Merge(m, src) } func (m *SoundcloudPlaylistInput) XXX_Size() int { return m.Size() @@ -963,7 +960,7 @@ func (m *SoundcloudTrackInput) Reset() { *m = SoundcloudTrackInput{} } func (m *SoundcloudTrackInput) String() string { return proto.CompactTextString(m) } func (*SoundcloudTrackInput) ProtoMessage() {} func (*SoundcloudTrackInput) Descriptor() ([]byte, []int) { - return fileDescriptor_api_08a853a0061745aa, []int{23} + return fileDescriptor_1b40cafcd4234784, []int{23} } func (m *SoundcloudTrackInput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -980,8 +977,8 @@ func (m *SoundcloudTrackInput) XXX_Marshal(b []byte, deterministic bool) ([]byte return b[:n], nil } } -func (dst *SoundcloudTrackInput) XXX_Merge(src proto.Message) { - xxx_messageInfo_SoundcloudTrackInput.Merge(dst, src) +func (m *SoundcloudTrackInput) XXX_Merge(src proto.Message) { + xxx_messageInfo_SoundcloudTrackInput.Merge(m, src) } func (m *SoundcloudTrackInput) XXX_Size() int { return m.Size() @@ -1027,6 +1024,80 @@ func init() { proto.RegisterType((*SoundcloudTrackInput)(nil), "calcbiz.server.SoundcloudTrackInput") } +func init() { proto.RegisterFile("api/api.proto", fileDescriptor_1b40cafcd4234784) } + +var fileDescriptor_1b40cafcd4234784 = []byte{ + // 1078 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0xdb, 0x36, + 0x14, 0x8e, 0x1d, 0x27, 0x6b, 0x5e, 0x1a, 0xdb, 0x61, 0x1c, 0xc7, 0x56, 0x52, 0x27, 0x65, 0xdb, + 0xb5, 0xd9, 0x50, 0x0b, 0xeb, 0x2e, 0x45, 0x6e, 0x59, 0x9b, 0x01, 0x41, 0xd7, 0x35, 0x70, 0xba, + 0x15, 0xc8, 0x65, 0x90, 0x2d, 0x5a, 0x56, 0x23, 0x89, 0x1a, 0x45, 0x35, 0xf0, 0x82, 0x5c, 0x76, + 0x1e, 0xb0, 0x01, 0xfb, 0xa7, 0x86, 0x9d, 0x0a, 0xec, 0xb2, 0xe3, 0x90, 0xec, 0x0f, 0x19, 0x44, + 0xca, 0xa2, 0x4d, 0x59, 0xdd, 0xa9, 0x17, 0x83, 0x7c, 0xef, 0x7b, 0xdf, 0x47, 0xf1, 0xc7, 0xf7, + 0x0c, 0x6b, 0x56, 0xe8, 0x9a, 0x56, 0xe8, 0x76, 0x43, 0x46, 0x39, 0x45, 0xd5, 0x81, 0xe5, 0x0d, + 0xfa, 0xee, 0x4f, 0xdd, 0x88, 0xb0, 0x77, 0x84, 0x19, 0x3b, 0x0e, 0xa5, 0x8e, 0x47, 0x4c, 0x81, + 0x0a, 0x02, 0xca, 0x2d, 0xee, 0xd2, 0x20, 0x92, 0x68, 0xe3, 0xb1, 0xe3, 0xf2, 0x51, 0xdc, 0xef, + 0x0e, 0xa8, 0x6f, 0x3a, 0xd4, 0xa1, 0xa6, 0x08, 0xf7, 0xe3, 0xa1, 0x98, 0x89, 0x89, 0x18, 0xa5, + 0xf0, 0x8d, 0xf0, 0xdc, 0x31, 0x07, 0x8c, 0x5c, 0x88, 0x9f, 0x34, 0xb8, 0x9b, 0x04, 0x23, 0x1a, + 0x07, 0xf6, 0xc0, 0xa3, 0xb1, 0x3d, 0x35, 0x94, 0x00, 0xbc, 0x0c, 0x95, 0xef, 0xa9, 0x6b, 0x63, + 0x03, 0x2a, 0x27, 0x34, 0x70, 0x10, 0x82, 0x4a, 0x48, 0x03, 0xa7, 0x55, 0xda, 0x2b, 0x3d, 0x5a, + 0xe9, 0x89, 0x31, 0xc6, 0x70, 0xfb, 0x05, 0x1b, 0x87, 0x9c, 0x46, 0xc7, 0x41, 0x18, 0xf3, 0x04, + 0x33, 0x64, 0xd4, 0x9f, 0x60, 0x92, 0x31, 0xde, 0x85, 0xb5, 0x14, 0xf3, 0x2a, 0xe6, 0x09, 0xa8, + 0x0a, 0x65, 0x4e, 0x53, 0x48, 0x99, 0x53, 0xfc, 0x00, 0x6a, 0xaf, 0xc3, 0x31, 0x3d, 0x0a, 0xe8, + 0xc0, 0x26, 0xc7, 0x61, 0x1c, 0x48, 0x1e, 0xca, 0x14, 0x0f, 0x65, 0x3e, 0xc6, 0x50, 0x57, 0xb0, + 0x57, 0x71, 0xc8, 0xe7, 0x50, 0x6d, 0xc1, 0xe6, 0x73, 0x6b, 0x14, 0xf5, 0xa9, 0xc5, 0xec, 0x9e, + 0x15, 0xd8, 0xd4, 0x97, 0x9a, 0x78, 0x1f, 0x6a, 0xdf, 0xc6, 0x7e, 0x9f, 0x30, 0x37, 0x18, 0x52, + 0xb9, 0xd6, 0x26, 0x2c, 0x07, 0x22, 0x24, 0xea, 0xcb, 0xbd, 0x74, 0x86, 0x7f, 0x2d, 0x41, 0x5d, + 0x61, 0xd3, 0x35, 0x1f, 0xc2, 0xd2, 0xd0, 0x1a, 0xf0, 0xa8, 0x55, 0xda, 0x5b, 0x7c, 0xb4, 0xfa, + 0xe4, 0xf3, 0xee, 0xec, 0x79, 0x75, 0xf5, 0x82, 0xee, 0xd7, 0x09, 0xfa, 0x28, 0xe0, 0x6c, 0xdc, + 0x93, 0x95, 0xc6, 0x53, 0x00, 0x15, 0x44, 0x75, 0x58, 0x3c, 0x27, 0xe3, 0x74, 0xe9, 0xc9, 0x10, + 0x35, 0x60, 0xe9, 0x9d, 0xe5, 0xc5, 0xa4, 0x55, 0x16, 0x31, 0x39, 0x39, 0x28, 0x3f, 0x2d, 0xe1, + 0x4f, 0xa1, 0xfa, 0x92, 0xba, 0x6f, 0x2d, 0xd7, 0x27, 0xe9, 0x72, 0x1a, 0xb0, 0x74, 0xee, 0x0e, + 0x87, 0x72, 0x39, 0x2b, 0x3d, 0x39, 0xc1, 0x7b, 0x00, 0x6f, 0x28, 0xb7, 0x53, 0x0c, 0x82, 0xca, + 0x05, 0x65, 0xf6, 0x64, 0x0f, 0x93, 0x31, 0xde, 0x87, 0x8d, 0x43, 0x8f, 0x13, 0x16, 0x58, 0x9c, + 0x7c, 0x43, 0x1d, 0xaa, 0xa0, 0xa1, 0xc5, 0x47, 0xd9, 0xd1, 0x5a, 0x7c, 0x84, 0xd7, 0xa1, 0x96, + 0x6d, 0x65, 0xba, 0x89, 0x0f, 0xa0, 0xd6, 0x23, 0x03, 0xc2, 0xb9, 0xc5, 0x29, 0xcb, 0x0e, 0x3c, + 0x22, 0x44, 0x8a, 0x2c, 0xf6, 0xc4, 0x18, 0x23, 0xa8, 0x2b, 0x58, 0x5a, 0x2a, 0xd8, 0xa2, 0xd1, + 0x34, 0x5b, 0x1b, 0xb6, 0x4e, 0x43, 0x46, 0x2c, 0x3b, 0x1a, 0xb9, 0x8c, 0xcf, 0x9c, 0x56, 0x13, + 0x1a, 0x53, 0xa9, 0x43, 0xcf, 0x4b, 0xe3, 0xdb, 0xd0, 0x3e, 0xcd, 0xae, 0xe9, 0x89, 0x67, 0x8d, + 0x3d, 0x37, 0xe2, 0xe9, 0xb5, 0xc2, 0x06, 0xb4, 0xf2, 0xc9, 0x34, 0xd7, 0x82, 0xa6, 0xca, 0xbd, + 0x66, 0xd6, 0xe0, 0x7c, 0x52, 0xb5, 0x05, 0x9b, 0x5a, 0x26, 0x4d, 0x1c, 0xc0, 0x56, 0x9e, 0x4e, + 0x7e, 0xf4, 0x2e, 0xac, 0x86, 0x69, 0xe0, 0x07, 0x57, 0x7e, 0x7b, 0xa5, 0x07, 0x93, 0xd0, 0xb1, + 0x8d, 0xbf, 0x80, 0x86, 0x46, 0x2a, 0x0b, 0xdb, 0x70, 0x8b, 0x27, 0x33, 0x55, 0xf5, 0x89, 0x98, + 0x1f, 0xdb, 0x4f, 0xfe, 0xac, 0xc2, 0xf2, 0xa9, 0xb8, 0x4b, 0x28, 0x80, 0x6a, 0xfa, 0x60, 0x8e, + 0x82, 0x41, 0x32, 0x40, 0x3b, 0xfa, 0x75, 0x9b, 0x7e, 0x74, 0xc6, 0x9d, 0x82, 0x6c, 0xfa, 0x21, + 0xbb, 0x3f, 0xff, 0xf5, 0xef, 0xef, 0xe5, 0x36, 0x6e, 0x08, 0x33, 0x39, 0x97, 0x39, 0x93, 0x48, + 0xea, 0x83, 0xd2, 0x67, 0x53, 0x7a, 0xcf, 0xc9, 0x47, 0xd3, 0xb3, 0x49, 0xa6, 0x47, 0x00, 0xd4, + 0x43, 0x46, 0xbb, 0x3a, 0x9b, 0xe6, 0x05, 0xc6, 0x5e, 0x31, 0x40, 0xba, 0x00, 0x6e, 0x08, 0xc5, + 0x2a, 0x5e, 0x11, 0x8a, 0x3c, 0x1c, 0xd3, 0x44, 0xe6, 0x08, 0x2a, 0x27, 0x6e, 0xe0, 0xa0, 0x86, + 0x5e, 0x9f, 0xb8, 0x9a, 0x91, 0x8b, 0x26, 0x1e, 0x87, 0xd7, 0x05, 0xd3, 0x2a, 0x92, 0x4c, 0x61, + 0x52, 0x7e, 0x06, 0x2b, 0xd9, 0xcd, 0x2d, 0xe0, 0xca, 0x7d, 0x82, 0x7e, 0xd5, 0x9b, 0x82, 0xb6, + 0x8e, 0xaa, 0x82, 0xd6, 0xce, 0xe8, 0x9e, 0x41, 0xe5, 0x19, 0x23, 0x17, 0x05, 0xb4, 0x28, 0x8b, + 0x0a, 0xdb, 0x4e, 0x90, 0xda, 0x02, 0x93, 0x38, 0xfa, 0x11, 0x40, 0xb9, 0x4f, 0x7e, 0x3b, 0x35, + 0xdb, 0xcb, 0x6f, 0xa7, 0x6e, 0x5d, 0x78, 0x4f, 0x68, 0x18, 0xa8, 0x25, 0x34, 0x82, 0x2c, 0x6d, + 0x5e, 0xca, 0xf1, 0x15, 0xa2, 0x00, 0xea, 0x85, 0xe7, 0x25, 0x35, 0x93, 0xc8, 0x4b, 0xe6, 0xec, + 0xa1, 0x23, 0x24, 0x5b, 0xa8, 0x29, 0x24, 0x59, 0x96, 0x36, 0x2f, 0x13, 0x47, 0xb9, 0x42, 0x6f, + 0xe0, 0xd6, 0xc4, 0x01, 0x0b, 0x36, 0xab, 0xa3, 0x47, 0x67, 0x1d, 0x13, 0x6f, 0x0a, 0x85, 0x1a, + 0x5a, 0x13, 0x0a, 0xfe, 0x84, 0x2c, 0x82, 0xf5, 0x9c, 0x09, 0x15, 0x28, 0x3c, 0xd4, 0xa3, 0x45, + 0xee, 0x95, 0x3e, 0x00, 0xb4, 0x25, 0xa4, 0x22, 0x85, 0x32, 0x99, 0xe4, 0x7f, 0x0b, 0xd5, 0x59, + 0x7b, 0x2b, 0x50, 0xbc, 0xff, 0x01, 0x45, 0x65, 0x8a, 0x3b, 0x42, 0xae, 0x89, 0x1a, 0x39, 0x39, + 0xcb, 0xf3, 0xd0, 0x0b, 0xa8, 0x24, 0x3d, 0xa1, 0x40, 0xc1, 0xd0, 0xa3, 0xaa, 0x7f, 0x68, 0x57, + 0xed, 0x22, 0x21, 0x71, 0x60, 0x6d, 0xa6, 0x7d, 0x14, 0xb0, 0xde, 0xd3, 0xa3, 0x73, 0x7a, 0x0e, + 0xde, 0x16, 0xf4, 0x9b, 0x68, 0x43, 0xfe, 0xc7, 0x99, 0x20, 0x1e, 0x7b, 0x09, 0xef, 0x19, 0xdc, + 0x56, 0x06, 0xfa, 0xb2, 0xe8, 0xcc, 0x5b, 0x2a, 0xaa, 0xfe, 0xbc, 0x7c, 0x17, 0x11, 0x86, 0x0d, + 0x41, 0xde, 0x40, 0x48, 0xee, 0x89, 0xfa, 0x97, 0xe3, 0x13, 0xe4, 0xc3, 0xc6, 0x9c, 0x26, 0x52, + 0x20, 0x71, 0x67, 0x9e, 0x44, 0x56, 0x84, 0xef, 0x0a, 0x9d, 0x6d, 0xd4, 0xd6, 0x75, 0xc2, 0x8c, + 0xf7, 0x97, 0x12, 0xa0, 0xbc, 0x1e, 0xca, 0xdf, 0xa6, 0xf9, 0xcd, 0xc6, 0xd8, 0xf9, 0xd0, 0x0a, + 0xb0, 0x29, 0x16, 0xb0, 0x8f, 0x1e, 0x16, 0x2e, 0xc0, 0xbc, 0x9c, 0xea, 0x55, 0x57, 0xc8, 0x86, + 0xba, 0xde, 0x09, 0xff, 0xff, 0x6e, 0x28, 0x61, 0x59, 0xa1, 0xbd, 0xd7, 0x29, 0x59, 0x2e, 0x19, + 0xaf, 0xa0, 0xa6, 0xa9, 0xa0, 0xfb, 0xc5, 0x1f, 0xac, 0x3a, 0xa4, 0xd1, 0x2e, 0x14, 0xc5, 0xfb, + 0x42, 0xf3, 0x1e, 0xba, 0x3b, 0x5f, 0xd3, 0xbc, 0x9c, 0xb4, 0xd6, 0xab, 0xaf, 0xba, 0x7f, 0x5c, + 0x77, 0x4a, 0xef, 0xaf, 0x3b, 0xa5, 0x7f, 0xae, 0x3b, 0xa5, 0xdf, 0x6e, 0x3a, 0x0b, 0xef, 0x6f, + 0x3a, 0x0b, 0x7f, 0xdf, 0x74, 0x16, 0xce, 0x1a, 0xb1, 0xc7, 0x19, 0xe9, 0xfa, 0xc4, 0x4c, 0x75, + 0x12, 0xb2, 0xfe, 0xb2, 0xf8, 0xc7, 0xfb, 0xe5, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x13, 0x88, + 0xb6, 0x0c, 0x95, 0x0b, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -4201,77 +4272,3 @@ var ( ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowApi = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("api/api.proto", fileDescriptor_api_08a853a0061745aa) } - -var fileDescriptor_api_08a853a0061745aa = []byte{ - // 1078 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0xdb, 0x36, - 0x14, 0x8e, 0x1d, 0x27, 0x6b, 0x5e, 0x1a, 0xdb, 0x61, 0x1c, 0xc7, 0x56, 0x52, 0x27, 0x65, 0xdb, - 0xb5, 0xd9, 0x50, 0x0b, 0xeb, 0x2e, 0x45, 0x6e, 0x59, 0x9b, 0x01, 0x41, 0xd7, 0x35, 0x70, 0xba, - 0x15, 0xc8, 0x65, 0x90, 0x2d, 0x5a, 0x56, 0x23, 0x89, 0x1a, 0x45, 0x35, 0xf0, 0x82, 0x5c, 0x76, - 0x1e, 0xb0, 0x01, 0xfb, 0xa7, 0x86, 0x9d, 0x0a, 0xec, 0xb2, 0xe3, 0x90, 0xec, 0x0f, 0x19, 0x44, - 0xca, 0xa2, 0x4d, 0x59, 0xdd, 0xa9, 0x17, 0x83, 0x7c, 0xef, 0x7b, 0xdf, 0x47, 0xf1, 0xc7, 0xf7, - 0x0c, 0x6b, 0x56, 0xe8, 0x9a, 0x56, 0xe8, 0x76, 0x43, 0x46, 0x39, 0x45, 0xd5, 0x81, 0xe5, 0x0d, - 0xfa, 0xee, 0x4f, 0xdd, 0x88, 0xb0, 0x77, 0x84, 0x19, 0x3b, 0x0e, 0xa5, 0x8e, 0x47, 0x4c, 0x81, - 0x0a, 0x02, 0xca, 0x2d, 0xee, 0xd2, 0x20, 0x92, 0x68, 0xe3, 0xb1, 0xe3, 0xf2, 0x51, 0xdc, 0xef, - 0x0e, 0xa8, 0x6f, 0x3a, 0xd4, 0xa1, 0xa6, 0x08, 0xf7, 0xe3, 0xa1, 0x98, 0x89, 0x89, 0x18, 0xa5, - 0xf0, 0x8d, 0xf0, 0xdc, 0x31, 0x07, 0x8c, 0x5c, 0x88, 0x9f, 0x34, 0xb8, 0x9b, 0x04, 0x23, 0x1a, - 0x07, 0xf6, 0xc0, 0xa3, 0xb1, 0x3d, 0x35, 0x94, 0x00, 0xbc, 0x0c, 0x95, 0xef, 0xa9, 0x6b, 0x63, - 0x03, 0x2a, 0x27, 0x34, 0x70, 0x10, 0x82, 0x4a, 0x48, 0x03, 0xa7, 0x55, 0xda, 0x2b, 0x3d, 0x5a, - 0xe9, 0x89, 0x31, 0xc6, 0x70, 0xfb, 0x05, 0x1b, 0x87, 0x9c, 0x46, 0xc7, 0x41, 0x18, 0xf3, 0x04, - 0x33, 0x64, 0xd4, 0x9f, 0x60, 0x92, 0x31, 0xde, 0x85, 0xb5, 0x14, 0xf3, 0x2a, 0xe6, 0x09, 0xa8, - 0x0a, 0x65, 0x4e, 0x53, 0x48, 0x99, 0x53, 0xfc, 0x00, 0x6a, 0xaf, 0xc3, 0x31, 0x3d, 0x0a, 0xe8, - 0xc0, 0x26, 0xc7, 0x61, 0x1c, 0x48, 0x1e, 0xca, 0x14, 0x0f, 0x65, 0x3e, 0xc6, 0x50, 0x57, 0xb0, - 0x57, 0x71, 0xc8, 0xe7, 0x50, 0x6d, 0xc1, 0xe6, 0x73, 0x6b, 0x14, 0xf5, 0xa9, 0xc5, 0xec, 0x9e, - 0x15, 0xd8, 0xd4, 0x97, 0x9a, 0x78, 0x1f, 0x6a, 0xdf, 0xc6, 0x7e, 0x9f, 0x30, 0x37, 0x18, 0x52, - 0xb9, 0xd6, 0x26, 0x2c, 0x07, 0x22, 0x24, 0xea, 0xcb, 0xbd, 0x74, 0x86, 0x7f, 0x2d, 0x41, 0x5d, - 0x61, 0xd3, 0x35, 0x1f, 0xc2, 0xd2, 0xd0, 0x1a, 0xf0, 0xa8, 0x55, 0xda, 0x5b, 0x7c, 0xb4, 0xfa, - 0xe4, 0xf3, 0xee, 0xec, 0x79, 0x75, 0xf5, 0x82, 0xee, 0xd7, 0x09, 0xfa, 0x28, 0xe0, 0x6c, 0xdc, - 0x93, 0x95, 0xc6, 0x53, 0x00, 0x15, 0x44, 0x75, 0x58, 0x3c, 0x27, 0xe3, 0x74, 0xe9, 0xc9, 0x10, - 0x35, 0x60, 0xe9, 0x9d, 0xe5, 0xc5, 0xa4, 0x55, 0x16, 0x31, 0x39, 0x39, 0x28, 0x3f, 0x2d, 0xe1, - 0x4f, 0xa1, 0xfa, 0x92, 0xba, 0x6f, 0x2d, 0xd7, 0x27, 0xe9, 0x72, 0x1a, 0xb0, 0x74, 0xee, 0x0e, - 0x87, 0x72, 0x39, 0x2b, 0x3d, 0x39, 0xc1, 0x7b, 0x00, 0x6f, 0x28, 0xb7, 0x53, 0x0c, 0x82, 0xca, - 0x05, 0x65, 0xf6, 0x64, 0x0f, 0x93, 0x31, 0xde, 0x87, 0x8d, 0x43, 0x8f, 0x13, 0x16, 0x58, 0x9c, - 0x7c, 0x43, 0x1d, 0xaa, 0xa0, 0xa1, 0xc5, 0x47, 0xd9, 0xd1, 0x5a, 0x7c, 0x84, 0xd7, 0xa1, 0x96, - 0x6d, 0x65, 0xba, 0x89, 0x0f, 0xa0, 0xd6, 0x23, 0x03, 0xc2, 0xb9, 0xc5, 0x29, 0xcb, 0x0e, 0x3c, - 0x22, 0x44, 0x8a, 0x2c, 0xf6, 0xc4, 0x18, 0x23, 0xa8, 0x2b, 0x58, 0x5a, 0x2a, 0xd8, 0xa2, 0xd1, - 0x34, 0x5b, 0x1b, 0xb6, 0x4e, 0x43, 0x46, 0x2c, 0x3b, 0x1a, 0xb9, 0x8c, 0xcf, 0x9c, 0x56, 0x13, - 0x1a, 0x53, 0xa9, 0x43, 0xcf, 0x4b, 0xe3, 0xdb, 0xd0, 0x3e, 0xcd, 0xae, 0xe9, 0x89, 0x67, 0x8d, - 0x3d, 0x37, 0xe2, 0xe9, 0xb5, 0xc2, 0x06, 0xb4, 0xf2, 0xc9, 0x34, 0xd7, 0x82, 0xa6, 0xca, 0xbd, - 0x66, 0xd6, 0xe0, 0x7c, 0x52, 0xb5, 0x05, 0x9b, 0x5a, 0x26, 0x4d, 0x1c, 0xc0, 0x56, 0x9e, 0x4e, - 0x7e, 0xf4, 0x2e, 0xac, 0x86, 0x69, 0xe0, 0x07, 0x57, 0x7e, 0x7b, 0xa5, 0x07, 0x93, 0xd0, 0xb1, - 0x8d, 0xbf, 0x80, 0x86, 0x46, 0x2a, 0x0b, 0xdb, 0x70, 0x8b, 0x27, 0x33, 0x55, 0xf5, 0x89, 0x98, - 0x1f, 0xdb, 0x4f, 0xfe, 0xac, 0xc2, 0xf2, 0xa9, 0xb8, 0x4b, 0x28, 0x80, 0x6a, 0xfa, 0x60, 0x8e, - 0x82, 0x41, 0x32, 0x40, 0x3b, 0xfa, 0x75, 0x9b, 0x7e, 0x74, 0xc6, 0x9d, 0x82, 0x6c, 0xfa, 0x21, - 0xbb, 0x3f, 0xff, 0xf5, 0xef, 0xef, 0xe5, 0x36, 0x6e, 0x08, 0x33, 0x39, 0x97, 0x39, 0x93, 0x48, - 0xea, 0x83, 0xd2, 0x67, 0x53, 0x7a, 0xcf, 0xc9, 0x47, 0xd3, 0xb3, 0x49, 0xa6, 0x47, 0x00, 0xd4, - 0x43, 0x46, 0xbb, 0x3a, 0x9b, 0xe6, 0x05, 0xc6, 0x5e, 0x31, 0x40, 0xba, 0x00, 0x6e, 0x08, 0xc5, - 0x2a, 0x5e, 0x11, 0x8a, 0x3c, 0x1c, 0xd3, 0x44, 0xe6, 0x08, 0x2a, 0x27, 0x6e, 0xe0, 0xa0, 0x86, - 0x5e, 0x9f, 0xb8, 0x9a, 0x91, 0x8b, 0x26, 0x1e, 0x87, 0xd7, 0x05, 0xd3, 0x2a, 0x92, 0x4c, 0x61, - 0x52, 0x7e, 0x06, 0x2b, 0xd9, 0xcd, 0x2d, 0xe0, 0xca, 0x7d, 0x82, 0x7e, 0xd5, 0x9b, 0x82, 0xb6, - 0x8e, 0xaa, 0x82, 0xd6, 0xce, 0xe8, 0x9e, 0x41, 0xe5, 0x19, 0x23, 0x17, 0x05, 0xb4, 0x28, 0x8b, - 0x0a, 0xdb, 0x4e, 0x90, 0xda, 0x02, 0x93, 0x38, 0xfa, 0x11, 0x40, 0xb9, 0x4f, 0x7e, 0x3b, 0x35, - 0xdb, 0xcb, 0x6f, 0xa7, 0x6e, 0x5d, 0x78, 0x4f, 0x68, 0x18, 0xa8, 0x25, 0x34, 0x82, 0x2c, 0x6d, - 0x5e, 0xca, 0xf1, 0x15, 0xa2, 0x00, 0xea, 0x85, 0xe7, 0x25, 0x35, 0x93, 0xc8, 0x4b, 0xe6, 0xec, - 0xa1, 0x23, 0x24, 0x5b, 0xa8, 0x29, 0x24, 0x59, 0x96, 0x36, 0x2f, 0x13, 0x47, 0xb9, 0x42, 0x6f, - 0xe0, 0xd6, 0xc4, 0x01, 0x0b, 0x36, 0xab, 0xa3, 0x47, 0x67, 0x1d, 0x13, 0x6f, 0x0a, 0x85, 0x1a, - 0x5a, 0x13, 0x0a, 0xfe, 0x84, 0x2c, 0x82, 0xf5, 0x9c, 0x09, 0x15, 0x28, 0x3c, 0xd4, 0xa3, 0x45, - 0xee, 0x95, 0x3e, 0x00, 0xb4, 0x25, 0xa4, 0x22, 0x85, 0x32, 0x99, 0xe4, 0x7f, 0x0b, 0xd5, 0x59, - 0x7b, 0x2b, 0x50, 0xbc, 0xff, 0x01, 0x45, 0x65, 0x8a, 0x3b, 0x42, 0xae, 0x89, 0x1a, 0x39, 0x39, - 0xcb, 0xf3, 0xd0, 0x0b, 0xa8, 0x24, 0x3d, 0xa1, 0x40, 0xc1, 0xd0, 0xa3, 0xaa, 0x7f, 0x68, 0x57, - 0xed, 0x22, 0x21, 0x71, 0x60, 0x6d, 0xa6, 0x7d, 0x14, 0xb0, 0xde, 0xd3, 0xa3, 0x73, 0x7a, 0x0e, - 0xde, 0x16, 0xf4, 0x9b, 0x68, 0x43, 0xfe, 0xc7, 0x99, 0x20, 0x1e, 0x7b, 0x09, 0xef, 0x19, 0xdc, - 0x56, 0x06, 0xfa, 0xb2, 0xe8, 0xcc, 0x5b, 0x2a, 0xaa, 0xfe, 0xbc, 0x7c, 0x17, 0x11, 0x86, 0x0d, - 0x41, 0xde, 0x40, 0x48, 0xee, 0x89, 0xfa, 0x97, 0xe3, 0x13, 0xe4, 0xc3, 0xc6, 0x9c, 0x26, 0x52, - 0x20, 0x71, 0x67, 0x9e, 0x44, 0x56, 0x84, 0xef, 0x0a, 0x9d, 0x6d, 0xd4, 0xd6, 0x75, 0xc2, 0x8c, - 0xf7, 0x97, 0x12, 0xa0, 0xbc, 0x1e, 0xca, 0xdf, 0xa6, 0xf9, 0xcd, 0xc6, 0xd8, 0xf9, 0xd0, 0x0a, - 0xb0, 0x29, 0x16, 0xb0, 0x8f, 0x1e, 0x16, 0x2e, 0xc0, 0xbc, 0x9c, 0xea, 0x55, 0x57, 0xc8, 0x86, - 0xba, 0xde, 0x09, 0xff, 0xff, 0x6e, 0x28, 0x61, 0x59, 0xa1, 0xbd, 0xd7, 0x29, 0x59, 0x2e, 0x19, - 0xaf, 0xa0, 0xa6, 0xa9, 0xa0, 0xfb, 0xc5, 0x1f, 0xac, 0x3a, 0xa4, 0xd1, 0x2e, 0x14, 0xc5, 0xfb, - 0x42, 0xf3, 0x1e, 0xba, 0x3b, 0x5f, 0xd3, 0xbc, 0x9c, 0xb4, 0xd6, 0xab, 0xaf, 0xba, 0x7f, 0x5c, - 0x77, 0x4a, 0xef, 0xaf, 0x3b, 0xa5, 0x7f, 0xae, 0x3b, 0xa5, 0xdf, 0x6e, 0x3a, 0x0b, 0xef, 0x6f, - 0x3a, 0x0b, 0x7f, 0xdf, 0x74, 0x16, 0xce, 0x1a, 0xb1, 0xc7, 0x19, 0xe9, 0xfa, 0xc4, 0x4c, 0x75, - 0x12, 0xb2, 0xfe, 0xb2, 0xf8, 0xc7, 0xfb, 0xe5, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x13, 0x88, - 0xb6, 0x0c, 0x95, 0x0b, 0x00, 0x00, -} diff --git a/api/api.pb.gw.go b/api/api.pb.gw.go index b914a935..a65bc061 100644 --- a/api/api.pb.gw.go +++ b/api/api.pb.gw.go @@ -32,7 +32,11 @@ func request_Server_KryptosEncrypt_0(ctx context.Context, marshaler runtime.Mars var protoReq KryptosInput var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -45,7 +49,11 @@ func request_Server_KryptosDecrypt_0(ctx context.Context, marshaler runtime.Mars var protoReq KryptosInput var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -58,7 +66,11 @@ func request_Server_TpyoEnocde_0(ctx context.Context, marshaler runtime.Marshale var protoReq TpyoEnocdeIpunt var metadata runtime.ServerMetadata - if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { + newReader, berr := utilities.IOReaderFactory(req.Body) + if berr != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) + } + if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } diff --git a/apidocs.swagger.json b/apidocs.swagger.json new file mode 100644 index 00000000..5f73b759 --- /dev/null +++ b/apidocs.swagger.json @@ -0,0 +1,922 @@ +{ + "swagger": "2.0", + "info": { + "title": "api/api.proto", + "version": "version not set" + }, + "schemes": [ + "http", + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/api/alternate-logo": { + "get": { + "operationId": "AlternateLogo", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverAlternateLogoOutput" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/crew": { + "get": { + "operationId": "Crew", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/crewCrew" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/dashboard": { + "get": { + "operationId": "Dashboard", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverDashboardOutput" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/kryptos/decrypt": { + "post": { + "operationId": "KryptosDecrypt", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverKryptosOutput" + } + } + }, + "parameters": [ + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/serverKryptosInput" + } + } + ], + "tags": [ + "Server" + ] + } + }, + "/api/kryptos/encrypt": { + "post": { + "operationId": "KryptosEncrypt", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverKryptosOutput" + } + } + }, + "parameters": [ + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/serverKryptosInput" + } + } + ], + "tags": [ + "Server" + ] + } + }, + "/api/moijaime": { + "get": { + "operationId": "Moijaime", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverMoijaimeOutput" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/numberinfo/{number}": { + "get": { + "operationId": "Numberinfo", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverNumberinfoOutput" + } + } + }, + "parameters": [ + { + "name": "number", + "in": "path", + "required": true, + "type": "number", + "format": "float" + } + ], + "tags": [ + "Server" + ] + } + }, + "/api/ping": { + "get": { + "operationId": "Ping", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverPong" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/recettator/{seed}": { + "get": { + "operationId": "Recettator", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverRecettatorOutput" + } + } + }, + "parameters": [ + { + "name": "seed", + "in": "path", + "required": true, + "type": "string", + "format": "int64" + } + ], + "tags": [ + "Server" + ] + } + }, + "/api/soundcloud/me": { + "get": { + "operationId": "SoundcloudMe", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/soundcloudUser" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/soundcloud/playlists": { + "get": { + "operationId": "SoundcloudPlaylists", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/soundcloudPlaylists" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/soundcloud/playlists/{playlist_id}": { + "get": { + "operationId": "SoundcloudPlaylist", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/soundcloudPlaylist" + } + } + }, + "parameters": [ + { + "name": "playlist_id", + "in": "path", + "required": true, + "type": "string", + "format": "uint64" + } + ], + "tags": [ + "Server" + ] + } + }, + "/api/soundcloud/tracks": { + "get": { + "operationId": "SoundcloudTracks", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/soundcloudTracks" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/soundcloud/tracks/{track_id}": { + "get": { + "operationId": "SoundcloudTrack", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/soundcloudTrack" + } + } + }, + "parameters": [ + { + "name": "track_id", + "in": "path", + "required": true, + "type": "string", + "format": "uint64" + } + ], + "tags": [ + "Server" + ] + } + }, + "/api/spreadshirt/all": { + "get": { + "operationId": "SpreadshirtAll", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverSpreadshirtAllOutput" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/spreadshirt/random": { + "get": { + "operationId": "SpreadshirtRandom", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverSpreadshirtRandomOutput" + } + } + }, + "tags": [ + "Server" + ] + } + }, + "/api/tpyo": { + "post": { + "operationId": "TpyoEnocde", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverTpyoEnocdeOuptut" + } + } + }, + "parameters": [ + { + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/serverTpyoEnocdeIpunt" + } + } + ], + "tags": [ + "Server" + ] + } + }, + "/api/wotd": { + "get": { + "operationId": "Wotd", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/serverWotdOutput" + } + } + }, + "tags": [ + "Server" + ] + } + } + }, + "definitions": { + "crewCrew": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "website": { + "type": "string" + }, + "members": { + "type": "array", + "items": { + "$ref": "#/definitions/crewPerson" + } + }, + "accounts": { + "type": "array", + "items": { + "$ref": "#/definitions/crewWebAccount" + } + }, + "friends": { + "type": "array", + "items": { + "$ref": "#/definitions/crewFriend" + } + } + } + }, + "crewFriend": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "name": { + "type": "string" + }, + "description": { + "type": "string" + }, + "logo_url": { + "type": "string" + }, + "links": { + "type": "array", + "items": { + "$ref": "#/definitions/crewLink" + } + }, + "image_url": { + "type": "string" + } + } + }, + "crewLink": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "url": { + "type": "string" + } + } + }, + "crewPerson": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "name": { + "type": "string" + } + } + }, + "crewWebAccount": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "provider": { + "type": "string" + }, + "handle": { + "type": "string" + }, + "url": { + "type": "string" + } + } + }, + "serverAlternateLogoOutput": { + "type": "object", + "properties": { + "path": { + "type": "string" + } + } + }, + "serverDashboardOutput": { + "type": "object" + }, + "serverKryptosInput": { + "type": "object", + "properties": { + "from": { + "type": "string" + } + } + }, + "serverKryptosOutput": { + "type": "object", + "properties": { + "to": { + "type": "string" + } + } + }, + "serverMoijaimeOutput": { + "type": "object", + "properties": { + "kiffs": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "serverNumberinfoOutput": { + "type": "object", + "properties": { + "facts": { + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + }, + "serverPong": { + "type": "object", + "properties": { + "pong": { + "type": "string" + } + } + }, + "serverRecettatorOutput": { + "type": "object" + }, + "serverSpreadshirtAllOutput": { + "type": "object" + }, + "serverSpreadshirtRandomOutput": { + "type": "object" + }, + "serverTpyoEnocdeIpunt": { + "type": "object", + "properties": { + "form": { + "type": "string" + } + } + }, + "serverTpyoEnocdeOuptut": { + "type": "object", + "properties": { + "to": { + "type": "string" + } + } + }, + "serverWotdOutput": { + "type": "object", + "properties": { + "word": { + "type": "string" + } + } + }, + "soundcloudPlaylist": { + "type": "object", + "properties": { + "id": { + "type": "string", + "format": "uint64" + }, + "created_at": { + "type": "string" + }, + "title": { + "type": "string" + }, + "sharing": { + "type": "string" + }, + "embeddable_by": { + "type": "string" + }, + "purchase_url": { + "type": "string" + }, + "artwork_url": { + "type": "string" + }, + "description": { + "type": "string" + }, + "duration": { + "type": "string", + "format": "uint64" + }, + "genre": { + "type": "string" + }, + "shared_to_count": { + "type": "string", + "format": "uint64" + }, + "tag_list": { + "type": "string" + }, + "release_day": { + "type": "integer", + "format": "int64", + "title": "uint64 release = 13;" + }, + "release_month": { + "type": "integer", + "format": "int64" + }, + "release_year": { + "type": "integer", + "format": "int64" + }, + "streamable": { + "type": "boolean", + "format": "boolean" + }, + "downloadable": { + "type": "boolean", + "format": "boolean" + }, + "ean": { + "type": "string" + }, + "playlist_type": { + "type": "string" + }, + "tracks": { + "type": "array", + "items": { + "$ref": "#/definitions/soundcloudTrack" + } + }, + "uri": { + "type": "string" + }, + "label": { + "$ref": "#/definitions/soundcloudUser" + }, + "label_id": { + "type": "string", + "format": "uint64" + }, + "label_name": { + "type": "string" + }, + "user": { + "$ref": "#/definitions/soundcloudUser" + }, + "user_id": { + "type": "string", + "format": "uint64" + }, + "permalink": { + "type": "string" + }, + "permalink_url": { + "type": "string" + } + } + }, + "soundcloudPlaylists": { + "type": "object", + "properties": { + "playlists": { + "type": "array", + "items": { + "$ref": "#/definitions/soundcloudPlaylist" + } + } + } + }, + "soundcloudTrack": { + "type": "object", + "properties": { + "id": { + "type": "string", + "format": "uint64" + }, + "CreatedAt": { + "type": "string" + }, + "Title": { + "type": "string" + }, + "Sharing": { + "type": "string" + }, + "EmbeddableBy": { + "type": "string" + }, + "PurchaseUrl": { + "type": "string" + }, + "ArtworkUrl": { + "type": "string" + }, + "Description": { + "type": "string" + }, + "Duration": { + "type": "string", + "format": "uint64" + }, + "Genre": { + "type": "string" + }, + "SharedToCount": { + "type": "string", + "format": "uint64" + }, + "TagList": { + "type": "string" + }, + "ReleaseDay": { + "type": "integer", + "format": "int64", + "title": "uint64 Release = 13;" + }, + "ReleaseMonth": { + "type": "integer", + "format": "int64" + }, + "ReleaseYear": { + "type": "integer", + "format": "int64" + }, + "Streamable": { + "type": "boolean", + "format": "boolean" + }, + "Downloadable": { + "type": "boolean", + "format": "boolean" + }, + "State": { + "type": "string" + }, + "License": { + "type": "string" + }, + "TrackType": { + "type": "string" + }, + "WaveformUrl": { + "type": "string" + }, + "DownloadUrl": { + "type": "string" + }, + "StreamUrl": { + "type": "string" + }, + "VideoUrl": { + "type": "string" + }, + "Bpm": { + "type": "number", + "format": "float" + }, + "Commentable": { + "type": "boolean", + "format": "boolean" + }, + "ISRC": { + "type": "string" + }, + "KeySignature": { + "type": "string" + }, + "CommentCount": { + "type": "string", + "format": "uint64" + }, + "DownloadCount": { + "type": "string", + "format": "uint64" + }, + "PlaybackCount": { + "type": "string", + "format": "uint64" + }, + "FavoritingsCount": { + "type": "string", + "format": "uint64" + }, + "OriginalFormat": { + "type": "string" + }, + "OriginalContentSize": { + "type": "string", + "format": "uint64" + }, + "AssetData": { + "type": "string", + "format": "byte", + "title": "App created_with = 36;" + }, + "ArtworkData": { + "type": "string", + "format": "byte" + }, + "UserFavorite": { + "type": "boolean", + "format": "boolean" + }, + "uri": { + "type": "string" + }, + "label": { + "$ref": "#/definitions/soundcloudUser" + }, + "label_id": { + "type": "string", + "format": "uint64" + }, + "label_name": { + "type": "string" + }, + "user": { + "$ref": "#/definitions/soundcloudUser" + }, + "user_id": { + "type": "string", + "format": "uint64" + }, + "permalink": { + "type": "string" + }, + "permalink_url": { + "type": "string" + } + } + }, + "soundcloudTracks": { + "type": "object", + "properties": { + "tracks": { + "type": "array", + "items": { + "$ref": "#/definitions/soundcloudTrack" + } + } + } + }, + "soundcloudUser": { + "type": "object", + "properties": { + "id": { + "type": "string", + "format": "uint64" + }, + "username": { + "type": "string" + }, + "avatar_url": { + "type": "string" + }, + "country": { + "type": "string" + }, + "full_name": { + "type": "string" + }, + "city": { + "type": "string" + }, + "description": { + "type": "string" + }, + "discogs_name": { + "type": "string" + }, + "myspace_name": { + "type": "string" + }, + "website": { + "type": "string" + }, + "website_title": { + "type": "string" + }, + "online": { + "type": "boolean", + "format": "boolean" + }, + "track_count": { + "type": "string", + "format": "uint64" + }, + "playlist_count": { + "type": "string", + "format": "uint64" + }, + "followers_count": { + "type": "string", + "format": "uint64" + }, + "followings_count": { + "type": "string", + "format": "uint64" + }, + "public_favorites_count": { + "type": "string", + "format": "uint64" + }, + "avatar_data": { + "type": "string", + "format": "byte" + }, + "uri": { + "type": "string" + }, + "permalink": { + "type": "string" + }, + "permalink_url": { + "type": "string" + } + } + } + } +} diff --git a/go.mod b/go.mod index 5feeca28..97ebe0fd 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module ultre.me/calcbiz require ( github.com/gobuffalo/packr v1.21.9 github.com/gogo/gateway v1.0.0 - github.com/gogo/protobuf v1.2.0 + github.com/gogo/protobuf v1.2.0 // indirect github.com/golang/protobuf v1.2.0 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect github.com/gorilla/handlers v1.4.0 @@ -24,7 +24,7 @@ require ( go.uber.org/zap v1.9.1 golang.org/x/net v0.0.0-20190110044637-be1c187aa6c6 google.golang.org/appengine v1.2.0 // indirect - google.golang.org/genproto v0.0.0-20190108161440-ae2f86662275 + google.golang.org/genproto v0.0.0-20190108161440-ae2f86662275 // indirect google.golang.org/grpc v1.17.0 ultre.me/kryptos v0.0.0-20181023194748-240fe1a16033 ) diff --git a/pkg/crew/crew.pb.go b/pkg/crew/crew.pb.go index 731c6844..b28fba2b 100644 --- a/pkg/crew/crew.pb.go +++ b/pkg/crew/crew.pb.go @@ -1,15 +1,16 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: pkg/crew/crew.proto -package crew // import "ultre.me/calcbiz/pkg/crew" +package crew -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import _ "google.golang.org/genproto/googleapis/api/annotations" - -import io "io" +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + _ "google.golang.org/genproto/googleapis/api/annotations" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -25,16 +26,16 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package type Crew struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Website string `protobuf:"bytes,2,opt,name=website,proto3" json:"website,omitempty"` - Members []*Person `protobuf:"bytes,3,rep,name=members" json:"members,omitempty"` - Accounts []*WebAccount `protobuf:"bytes,4,rep,name=accounts" json:"accounts,omitempty"` - Friends []*Friend `protobuf:"bytes,5,rep,name=friends" json:"friends,omitempty"` + Members []*Person `protobuf:"bytes,3,rep,name=members,proto3" json:"members,omitempty"` + Accounts []*WebAccount `protobuf:"bytes,4,rep,name=accounts,proto3" json:"accounts,omitempty"` + Friends []*Friend `protobuf:"bytes,5,rep,name=friends,proto3" json:"friends,omitempty"` } func (m *Crew) Reset() { *m = Crew{} } func (m *Crew) String() string { return proto.CompactTextString(m) } func (*Crew) ProtoMessage() {} func (*Crew) Descriptor() ([]byte, []int) { - return fileDescriptor_crew_26e212dfbbdddd43, []int{0} + return fileDescriptor_94474f1a6a16de86, []int{0} } func (m *Crew) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -51,8 +52,8 @@ func (m *Crew) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Crew) XXX_Merge(src proto.Message) { - xxx_messageInfo_Crew.Merge(dst, src) +func (m *Crew) XXX_Merge(src proto.Message) { + xxx_messageInfo_Crew.Merge(m, src) } func (m *Crew) XXX_Size() int { return m.Size() @@ -107,7 +108,7 @@ func (m *Person) Reset() { *m = Person{} } func (m *Person) String() string { return proto.CompactTextString(m) } func (*Person) ProtoMessage() {} func (*Person) Descriptor() ([]byte, []int) { - return fileDescriptor_crew_26e212dfbbdddd43, []int{1} + return fileDescriptor_94474f1a6a16de86, []int{1} } func (m *Person) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -124,8 +125,8 @@ func (m *Person) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Person) XXX_Merge(src proto.Message) { - xxx_messageInfo_Person.Merge(dst, src) +func (m *Person) XXX_Merge(src proto.Message) { + xxx_messageInfo_Person.Merge(m, src) } func (m *Person) XXX_Size() int { return m.Size() @@ -161,7 +162,7 @@ func (m *WebAccount) Reset() { *m = WebAccount{} } func (m *WebAccount) String() string { return proto.CompactTextString(m) } func (*WebAccount) ProtoMessage() {} func (*WebAccount) Descriptor() ([]byte, []int) { - return fileDescriptor_crew_26e212dfbbdddd43, []int{2} + return fileDescriptor_94474f1a6a16de86, []int{2} } func (m *WebAccount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -178,8 +179,8 @@ func (m *WebAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *WebAccount) XXX_Merge(src proto.Message) { - xxx_messageInfo_WebAccount.Merge(dst, src) +func (m *WebAccount) XXX_Merge(src proto.Message) { + xxx_messageInfo_WebAccount.Merge(m, src) } func (m *WebAccount) XXX_Size() int { return m.Size() @@ -227,7 +228,7 @@ func (m *Link) Reset() { *m = Link{} } func (m *Link) String() string { return proto.CompactTextString(m) } func (*Link) ProtoMessage() {} func (*Link) Descriptor() ([]byte, []int) { - return fileDescriptor_crew_26e212dfbbdddd43, []int{3} + return fileDescriptor_94474f1a6a16de86, []int{3} } func (m *Link) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -244,8 +245,8 @@ func (m *Link) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Link) XXX_Merge(src proto.Message) { - xxx_messageInfo_Link.Merge(dst, src) +func (m *Link) XXX_Merge(src proto.Message) { + xxx_messageInfo_Link.Merge(m, src) } func (m *Link) XXX_Size() int { return m.Size() @@ -275,7 +276,7 @@ type Friend struct { Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` LogoURL string `protobuf:"bytes,4,opt,name=logo_url,json=logoUrl,proto3" json:"logo_url,omitempty"` - Links []*Link `protobuf:"bytes,5,rep,name=links" json:"links,omitempty"` + Links []*Link `protobuf:"bytes,5,rep,name=links,proto3" json:"links,omitempty"` ImageURL string `protobuf:"bytes,6,opt,name=image_url,json=imageUrl,proto3" json:"image_url,omitempty"` } @@ -283,7 +284,7 @@ func (m *Friend) Reset() { *m = Friend{} } func (m *Friend) String() string { return proto.CompactTextString(m) } func (*Friend) ProtoMessage() {} func (*Friend) Descriptor() ([]byte, []int) { - return fileDescriptor_crew_26e212dfbbdddd43, []int{4} + return fileDescriptor_94474f1a6a16de86, []int{4} } func (m *Friend) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -300,8 +301,8 @@ func (m *Friend) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Friend) XXX_Merge(src proto.Message) { - xxx_messageInfo_Friend.Merge(dst, src) +func (m *Friend) XXX_Merge(src proto.Message) { + xxx_messageInfo_Friend.Merge(m, src) } func (m *Friend) XXX_Size() int { return m.Size() @@ -361,6 +362,42 @@ func init() { proto.RegisterType((*Link)(nil), "calcbiz.crew.Link") proto.RegisterType((*Friend)(nil), "calcbiz.crew.Friend") } + +func init() { proto.RegisterFile("pkg/crew/crew.proto", fileDescriptor_94474f1a6a16de86) } + +var fileDescriptor_94474f1a6a16de86 = []byte{ + // 457 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x8b, 0xd3, 0x40, + 0x14, 0x6e, 0x9a, 0x6e, 0x92, 0x7d, 0xdd, 0x83, 0x8c, 0x22, 0xd9, 0x22, 0x69, 0xe9, 0x41, 0xea, + 0xc1, 0x04, 0x5c, 0xfd, 0x01, 0xae, 0x20, 0x08, 0x3d, 0x48, 0xa0, 0x08, 0x5e, 0x24, 0x49, 0xdf, + 0xce, 0x0e, 0x9d, 0xcc, 0x84, 0x49, 0x62, 0xd1, 0x5f, 0xe1, 0xcf, 0x12, 0x41, 0xd8, 0xa3, 0xa7, + 0x22, 0xe9, 0x1f, 0x91, 0x99, 0x24, 0xed, 0x2e, 0xf4, 0xe0, 0x25, 0xcc, 0xfb, 0xde, 0xf7, 0xcd, + 0xf7, 0xbe, 0xc7, 0x04, 0x1e, 0x17, 0x1b, 0x1a, 0x65, 0x0a, 0xb7, 0xe6, 0x13, 0x16, 0x4a, 0x56, + 0x92, 0x5c, 0x64, 0x09, 0xcf, 0x52, 0xf6, 0x3d, 0xd4, 0xd8, 0xe4, 0x19, 0x95, 0x92, 0x72, 0x8c, + 0x92, 0x82, 0x45, 0x89, 0x10, 0xb2, 0x4a, 0x2a, 0x26, 0x45, 0xd9, 0x72, 0x27, 0x2f, 0x29, 0xab, + 0x6e, 0xeb, 0x34, 0xcc, 0x64, 0x1e, 0x51, 0x49, 0x65, 0x64, 0xe0, 0xb4, 0xbe, 0x31, 0x95, 0x29, + 0xcc, 0xa9, 0xa5, 0xcf, 0x7f, 0x59, 0x30, 0x7a, 0xa7, 0x70, 0x4b, 0x08, 0x8c, 0x44, 0x92, 0xa3, + 0x6f, 0xcd, 0xac, 0xc5, 0x79, 0x6c, 0xce, 0xc4, 0x07, 0x77, 0x8b, 0x69, 0xc9, 0x2a, 0xf4, 0x87, + 0x06, 0xee, 0x4b, 0x12, 0x82, 0x9b, 0x63, 0x9e, 0xa2, 0x2a, 0x7d, 0x7b, 0x66, 0x2f, 0xc6, 0xaf, + 0x9e, 0x84, 0xf7, 0x67, 0x0c, 0x3f, 0xa2, 0x2a, 0xa5, 0x88, 0x7b, 0x12, 0x79, 0x0d, 0x5e, 0x92, + 0x65, 0xb2, 0x16, 0x55, 0xe9, 0x8f, 0x8c, 0xc0, 0x7f, 0x28, 0xf8, 0x84, 0xe9, 0xdb, 0x96, 0x10, + 0x1f, 0x98, 0xda, 0xe5, 0x46, 0x31, 0x14, 0xeb, 0xd2, 0x3f, 0x3b, 0xe5, 0xf2, 0xde, 0x34, 0xe3, + 0x9e, 0x34, 0x0f, 0xc1, 0x69, 0x8d, 0xc9, 0x23, 0xb0, 0x37, 0xf8, 0xad, 0x0b, 0xa3, 0x8f, 0x87, + 0x7c, 0xc3, 0x63, 0xbe, 0x79, 0x0e, 0x70, 0xf4, 0x3d, 0xa1, 0x99, 0x80, 0x57, 0x28, 0xf9, 0x95, + 0xad, 0x51, 0x75, 0xba, 0x43, 0x4d, 0x9e, 0x82, 0x73, 0x9b, 0x88, 0x35, 0x47, 0xdf, 0x36, 0x9d, + 0xae, 0x22, 0x97, 0x60, 0xd7, 0x8a, 0xfb, 0x23, 0x0d, 0x5e, 0xbb, 0xcd, 0x6e, 0x6a, 0xaf, 0xe2, + 0x65, 0xac, 0xb1, 0xf9, 0x1b, 0x18, 0x2d, 0x99, 0xd8, 0x9c, 0x5c, 0x75, 0x27, 0x1b, 0x9e, 0x90, + 0xfd, 0xb6, 0xc0, 0x69, 0x93, 0xfe, 0x5f, 0x2c, 0x32, 0x83, 0xf1, 0x1a, 0xcb, 0x4c, 0xb1, 0x42, + 0x3f, 0x8c, 0x6e, 0xbe, 0xfb, 0x10, 0x79, 0x0e, 0x1e, 0x97, 0x54, 0x7e, 0x39, 0x4e, 0x3a, 0x6e, + 0x76, 0x53, 0x77, 0x29, 0xa9, 0xd4, 0xb6, 0xae, 0x6e, 0xae, 0x14, 0x27, 0x0b, 0x38, 0xe3, 0x4c, + 0x6c, 0xfa, 0xf5, 0x93, 0x87, 0xeb, 0xd7, 0x61, 0xe2, 0x96, 0x40, 0x5e, 0xc0, 0x39, 0xcb, 0x13, + 0x8a, 0xe6, 0x4a, 0xc7, 0x5c, 0x79, 0xd1, 0xec, 0xa6, 0xde, 0x07, 0x0d, 0xea, 0x3b, 0x3d, 0xd3, + 0x5e, 0x29, 0x7e, 0x7d, 0xf5, 0xb3, 0x09, 0xac, 0xbb, 0x26, 0xb0, 0xfe, 0x36, 0x81, 0xf5, 0x63, + 0x1f, 0x0c, 0xee, 0xf6, 0xc1, 0xe0, 0xcf, 0x3e, 0x18, 0x7c, 0xbe, 0xac, 0x79, 0xa5, 0x30, 0xcc, + 0x31, 0xea, 0x7c, 0xa2, 0xfe, 0x6f, 0x48, 0x1d, 0xf3, 0x5c, 0xaf, 0xfe, 0x05, 0x00, 0x00, 0xff, + 0xff, 0x87, 0xcc, 0x09, 0x0f, 0x20, 0x03, 0x00, 0x00, +} + func (m *Crew) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1653,38 +1690,3 @@ var ( ErrInvalidLengthCrew = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowCrew = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("pkg/crew/crew.proto", fileDescriptor_crew_26e212dfbbdddd43) } - -var fileDescriptor_crew_26e212dfbbdddd43 = []byte{ - // 457 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x8b, 0xd3, 0x40, - 0x14, 0x6e, 0x9a, 0x6e, 0x92, 0x7d, 0xdd, 0x83, 0x8c, 0x22, 0xd9, 0x22, 0x69, 0xe9, 0x41, 0xea, - 0xc1, 0x04, 0x5c, 0xfd, 0x01, 0xae, 0x20, 0x08, 0x3d, 0x48, 0xa0, 0x08, 0x5e, 0x24, 0x49, 0xdf, - 0xce, 0x0e, 0x9d, 0xcc, 0x84, 0x49, 0x62, 0xd1, 0x5f, 0xe1, 0xcf, 0x12, 0x41, 0xd8, 0xa3, 0xa7, - 0x22, 0xe9, 0x1f, 0x91, 0x99, 0x24, 0xed, 0x2e, 0xf4, 0xe0, 0x25, 0xcc, 0xfb, 0xde, 0xf7, 0xcd, - 0xf7, 0xbe, 0xc7, 0x04, 0x1e, 0x17, 0x1b, 0x1a, 0x65, 0x0a, 0xb7, 0xe6, 0x13, 0x16, 0x4a, 0x56, - 0x92, 0x5c, 0x64, 0x09, 0xcf, 0x52, 0xf6, 0x3d, 0xd4, 0xd8, 0xe4, 0x19, 0x95, 0x92, 0x72, 0x8c, - 0x92, 0x82, 0x45, 0x89, 0x10, 0xb2, 0x4a, 0x2a, 0x26, 0x45, 0xd9, 0x72, 0x27, 0x2f, 0x29, 0xab, - 0x6e, 0xeb, 0x34, 0xcc, 0x64, 0x1e, 0x51, 0x49, 0x65, 0x64, 0xe0, 0xb4, 0xbe, 0x31, 0x95, 0x29, - 0xcc, 0xa9, 0xa5, 0xcf, 0x7f, 0x59, 0x30, 0x7a, 0xa7, 0x70, 0x4b, 0x08, 0x8c, 0x44, 0x92, 0xa3, - 0x6f, 0xcd, 0xac, 0xc5, 0x79, 0x6c, 0xce, 0xc4, 0x07, 0x77, 0x8b, 0x69, 0xc9, 0x2a, 0xf4, 0x87, - 0x06, 0xee, 0x4b, 0x12, 0x82, 0x9b, 0x63, 0x9e, 0xa2, 0x2a, 0x7d, 0x7b, 0x66, 0x2f, 0xc6, 0xaf, - 0x9e, 0x84, 0xf7, 0x67, 0x0c, 0x3f, 0xa2, 0x2a, 0xa5, 0x88, 0x7b, 0x12, 0x79, 0x0d, 0x5e, 0x92, - 0x65, 0xb2, 0x16, 0x55, 0xe9, 0x8f, 0x8c, 0xc0, 0x7f, 0x28, 0xf8, 0x84, 0xe9, 0xdb, 0x96, 0x10, - 0x1f, 0x98, 0xda, 0xe5, 0x46, 0x31, 0x14, 0xeb, 0xd2, 0x3f, 0x3b, 0xe5, 0xf2, 0xde, 0x34, 0xe3, - 0x9e, 0x34, 0x0f, 0xc1, 0x69, 0x8d, 0xc9, 0x23, 0xb0, 0x37, 0xf8, 0xad, 0x0b, 0xa3, 0x8f, 0x87, - 0x7c, 0xc3, 0x63, 0xbe, 0x79, 0x0e, 0x70, 0xf4, 0x3d, 0xa1, 0x99, 0x80, 0x57, 0x28, 0xf9, 0x95, - 0xad, 0x51, 0x75, 0xba, 0x43, 0x4d, 0x9e, 0x82, 0x73, 0x9b, 0x88, 0x35, 0x47, 0xdf, 0x36, 0x9d, - 0xae, 0x22, 0x97, 0x60, 0xd7, 0x8a, 0xfb, 0x23, 0x0d, 0x5e, 0xbb, 0xcd, 0x6e, 0x6a, 0xaf, 0xe2, - 0x65, 0xac, 0xb1, 0xf9, 0x1b, 0x18, 0x2d, 0x99, 0xd8, 0x9c, 0x5c, 0x75, 0x27, 0x1b, 0x9e, 0x90, - 0xfd, 0xb6, 0xc0, 0x69, 0x93, 0xfe, 0x5f, 0x2c, 0x32, 0x83, 0xf1, 0x1a, 0xcb, 0x4c, 0xb1, 0x42, - 0x3f, 0x8c, 0x6e, 0xbe, 0xfb, 0x10, 0x79, 0x0e, 0x1e, 0x97, 0x54, 0x7e, 0x39, 0x4e, 0x3a, 0x6e, - 0x76, 0x53, 0x77, 0x29, 0xa9, 0xd4, 0xb6, 0xae, 0x6e, 0xae, 0x14, 0x27, 0x0b, 0x38, 0xe3, 0x4c, - 0x6c, 0xfa, 0xf5, 0x93, 0x87, 0xeb, 0xd7, 0x61, 0xe2, 0x96, 0x40, 0x5e, 0xc0, 0x39, 0xcb, 0x13, - 0x8a, 0xe6, 0x4a, 0xc7, 0x5c, 0x79, 0xd1, 0xec, 0xa6, 0xde, 0x07, 0x0d, 0xea, 0x3b, 0x3d, 0xd3, - 0x5e, 0x29, 0x7e, 0x7d, 0xf5, 0xb3, 0x09, 0xac, 0xbb, 0x26, 0xb0, 0xfe, 0x36, 0x81, 0xf5, 0x63, - 0x1f, 0x0c, 0xee, 0xf6, 0xc1, 0xe0, 0xcf, 0x3e, 0x18, 0x7c, 0xbe, 0xac, 0x79, 0xa5, 0x30, 0xcc, - 0x31, 0xea, 0x7c, 0xa2, 0xfe, 0x6f, 0x48, 0x1d, 0xf3, 0x5c, 0xaf, 0xfe, 0x05, 0x00, 0x00, 0xff, - 0xff, 0x87, 0xcc, 0x09, 0x0f, 0x20, 0x03, 0x00, 0x00, -} diff --git a/pkg/soundcloud/soundcloud.pb.go b/pkg/soundcloud/soundcloud.pb.go index ea65257d..c31dc11f 100644 --- a/pkg/soundcloud/soundcloud.pb.go +++ b/pkg/soundcloud/soundcloud.pb.go @@ -1,17 +1,17 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: pkg/soundcloud/soundcloud.proto -package soundcloud // import "ultre.me/calcbiz/pkg/soundcloud" - -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import _ "google.golang.org/genproto/googleapis/api/annotations" - -import encoding_binary "encoding/binary" - -import io "io" +package soundcloud + +import ( + encoding_binary "encoding/binary" + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + _ "google.golang.org/genproto/googleapis/api/annotations" + io "io" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -52,7 +52,7 @@ func (m *User) Reset() { *m = User{} } func (m *User) String() string { return proto.CompactTextString(m) } func (*User) ProtoMessage() {} func (*User) Descriptor() ([]byte, []int) { - return fileDescriptor_soundcloud_205f1aff27f92dc6, []int{0} + return fileDescriptor_54f10e75649df761, []int{0} } func (m *User) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -69,8 +69,8 @@ func (m *User) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *User) XXX_Merge(src proto.Message) { - xxx_messageInfo_User.Merge(dst, src) +func (m *User) XXX_Merge(src proto.Message) { + xxx_messageInfo_User.Merge(m, src) } func (m *User) XXX_Size() int { return m.Size() @@ -229,14 +229,14 @@ func (m *User) GetPermalinkURL() string { } type Playlists struct { - Playlists []*Playlist `protobuf:"bytes,1,rep,name=playlists" json:"playlists,omitempty"` + Playlists []*Playlist `protobuf:"bytes,1,rep,name=playlists,proto3" json:"playlists,omitempty"` } func (m *Playlists) Reset() { *m = Playlists{} } func (m *Playlists) String() string { return proto.CompactTextString(m) } func (*Playlists) ProtoMessage() {} func (*Playlists) Descriptor() ([]byte, []int) { - return fileDescriptor_soundcloud_205f1aff27f92dc6, []int{1} + return fileDescriptor_54f10e75649df761, []int{1} } func (m *Playlists) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -253,8 +253,8 @@ func (m *Playlists) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Playlists) XXX_Merge(src proto.Message) { - xxx_messageInfo_Playlists.Merge(dst, src) +func (m *Playlists) XXX_Merge(src proto.Message) { + xxx_messageInfo_Playlists.Merge(m, src) } func (m *Playlists) XXX_Size() int { return m.Size() @@ -293,12 +293,12 @@ type Playlist struct { Downloadable bool `protobuf:"varint,18,opt,name=downloadable,proto3" json:"downloadable,omitempty"` Ean string `protobuf:"bytes,19,opt,name=ean,proto3" json:"ean,omitempty"` PlaylistType string `protobuf:"bytes,20,opt,name=playlist_type,json=playlistType,proto3" json:"playlist_type,omitempty"` - Tracks []*Track `protobuf:"bytes,21,rep,name=tracks" json:"tracks,omitempty"` + Tracks []*Track `protobuf:"bytes,21,rep,name=tracks,proto3" json:"tracks,omitempty"` Uri string `protobuf:"bytes,22,opt,name=uri,proto3" json:"uri,omitempty"` - Label *User `protobuf:"bytes,23,opt,name=label" json:"label,omitempty"` + Label *User `protobuf:"bytes,23,opt,name=label,proto3" json:"label,omitempty"` LabelId uint64 `protobuf:"varint,24,opt,name=label_id,json=labelId,proto3" json:"label_id,omitempty"` LabelName string `protobuf:"bytes,25,opt,name=label_name,json=labelName,proto3" json:"label_name,omitempty"` - User *User `protobuf:"bytes,26,opt,name=user" json:"user,omitempty"` + User *User `protobuf:"bytes,26,opt,name=user,proto3" json:"user,omitempty"` UserId uint64 `protobuf:"varint,27,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` Permalink string `protobuf:"bytes,28,opt,name=permalink,proto3" json:"permalink,omitempty"` PermalinkUrl string `protobuf:"bytes,29,opt,name=permalink_url,json=permalinkUrl,proto3" json:"permalink_url,omitempty"` @@ -308,7 +308,7 @@ func (m *Playlist) Reset() { *m = Playlist{} } func (m *Playlist) String() string { return proto.CompactTextString(m) } func (*Playlist) ProtoMessage() {} func (*Playlist) Descriptor() ([]byte, []int) { - return fileDescriptor_soundcloud_205f1aff27f92dc6, []int{2} + return fileDescriptor_54f10e75649df761, []int{2} } func (m *Playlist) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -325,8 +325,8 @@ func (m *Playlist) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Playlist) XXX_Merge(src proto.Message) { - xxx_messageInfo_Playlist.Merge(dst, src) +func (m *Playlist) XXX_Merge(src proto.Message) { + xxx_messageInfo_Playlist.Merge(m, src) } func (m *Playlist) XXX_Size() int { return m.Size() @@ -534,14 +534,14 @@ func (m *Playlist) GetPermalinkUrl() string { } type Tracks struct { - Tracks []*Track `protobuf:"bytes,1,rep,name=tracks" json:"tracks,omitempty"` + Tracks []*Track `protobuf:"bytes,1,rep,name=tracks,proto3" json:"tracks,omitempty"` } func (m *Tracks) Reset() { *m = Tracks{} } func (m *Tracks) String() string { return proto.CompactTextString(m) } func (*Tracks) ProtoMessage() {} func (*Tracks) Descriptor() ([]byte, []int) { - return fileDescriptor_soundcloud_205f1aff27f92dc6, []int{3} + return fileDescriptor_54f10e75649df761, []int{3} } func (m *Tracks) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -558,8 +558,8 @@ func (m *Tracks) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Tracks) XXX_Merge(src proto.Message) { - xxx_messageInfo_Tracks.Merge(dst, src) +func (m *Tracks) XXX_Merge(src proto.Message) { + xxx_messageInfo_Tracks.Merge(m, src) } func (m *Tracks) XXX_Size() int { return m.Size() @@ -618,10 +618,10 @@ type Track struct { ArtworkData []byte `protobuf:"bytes,38,opt,name=ArtworkData,proto3" json:"ArtworkData,omitempty"` UserFavorite bool `protobuf:"varint,39,opt,name=UserFavorite,proto3" json:"UserFavorite,omitempty"` Uri string `protobuf:"bytes,40,opt,name=uri,proto3" json:"uri,omitempty"` - Label *User `protobuf:"bytes,41,opt,name=label" json:"label,omitempty"` + Label *User `protobuf:"bytes,41,opt,name=label,proto3" json:"label,omitempty"` LabelId uint64 `protobuf:"varint,42,opt,name=label_id,json=labelId,proto3" json:"label_id,omitempty"` LabelName string `protobuf:"bytes,43,opt,name=label_name,json=labelName,proto3" json:"label_name,omitempty"` - User *User `protobuf:"bytes,44,opt,name=user" json:"user,omitempty"` + User *User `protobuf:"bytes,44,opt,name=user,proto3" json:"user,omitempty"` UserId uint64 `protobuf:"varint,45,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` Permalink string `protobuf:"bytes,46,opt,name=permalink,proto3" json:"permalink,omitempty"` PermalinkUrl string `protobuf:"bytes,47,opt,name=permalink_url,json=permalinkUrl,proto3" json:"permalink_url,omitempty"` @@ -631,7 +631,7 @@ func (m *Track) Reset() { *m = Track{} } func (m *Track) String() string { return proto.CompactTextString(m) } func (*Track) ProtoMessage() {} func (*Track) Descriptor() ([]byte, []int) { - return fileDescriptor_soundcloud_205f1aff27f92dc6, []int{4} + return fileDescriptor_54f10e75649df761, []int{4} } func (m *Track) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -648,8 +648,8 @@ func (m *Track) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (dst *Track) XXX_Merge(src proto.Message) { - xxx_messageInfo_Track.Merge(dst, src) +func (m *Track) XXX_Merge(src proto.Message) { + xxx_messageInfo_Track.Merge(m, src) } func (m *Track) XXX_Size() int { return m.Size() @@ -982,6 +982,101 @@ func init() { proto.RegisterType((*Tracks)(nil), "calcbiz.soundcloud.Tracks") proto.RegisterType((*Track)(nil), "calcbiz.soundcloud.Track") } + +func init() { proto.RegisterFile("pkg/soundcloud/soundcloud.proto", fileDescriptor_54f10e75649df761) } + +var fileDescriptor_54f10e75649df761 = []byte{ + // 1394 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x97, 0xdd, 0x72, 0x13, 0xb7, + 0x1b, 0xc6, 0x71, 0x48, 0xfc, 0x21, 0xdb, 0x49, 0xfe, 0x02, 0x82, 0x08, 0xc1, 0x36, 0xe1, 0x0f, + 0x18, 0x0a, 0x76, 0x4b, 0xdb, 0x83, 0xb6, 0x47, 0x49, 0x5c, 0x98, 0x4c, 0x29, 0x65, 0xd6, 0x4e, + 0x3b, 0xed, 0x89, 0x47, 0xde, 0x55, 0x36, 0x3b, 0xac, 0x57, 0x1e, 0xad, 0x96, 0x8c, 0xb9, 0x88, + 0x4e, 0x6f, 0xa3, 0x77, 0xd2, 0x83, 0x1e, 0x70, 0xd8, 0x23, 0xa6, 0x13, 0x6e, 0xa4, 0xf3, 0xbe, + 0x92, 0xec, 0x75, 0x3e, 0x4a, 0x39, 0x8a, 0xde, 0x47, 0xcf, 0xae, 0x56, 0xef, 0x3e, 0x3f, 0x65, + 0x4d, 0x9a, 0x93, 0x57, 0x61, 0x37, 0x95, 0x59, 0x12, 0xf8, 0xb1, 0xcc, 0x82, 0xdc, 0xb0, 0x33, + 0x51, 0x52, 0x4b, 0x4a, 0x7d, 0x1e, 0xfb, 0xa3, 0xe8, 0x4d, 0x67, 0x3e, 0xb3, 0xb9, 0x15, 0x4a, + 0x19, 0xc6, 0xa2, 0xcb, 0x27, 0x51, 0x97, 0x27, 0x89, 0xd4, 0x5c, 0x47, 0x32, 0x49, 0xcd, 0x15, + 0x9b, 0x8f, 0xc3, 0x48, 0x1f, 0x65, 0xa3, 0x8e, 0x2f, 0xc7, 0xdd, 0x50, 0x86, 0xb2, 0x8b, 0xf2, + 0x28, 0x3b, 0xc4, 0x0a, 0x0b, 0x1c, 0x19, 0xfb, 0xf6, 0x9f, 0x2b, 0x64, 0xf9, 0x20, 0x15, 0x8a, + 0x6e, 0x90, 0xa5, 0x28, 0x60, 0x85, 0x56, 0xa1, 0xbd, 0xbc, 0x5b, 0x3c, 0x79, 0xd7, 0x5c, 0xda, + 0xef, 0x79, 0x4b, 0x51, 0x40, 0x37, 0x49, 0x39, 0x4b, 0x85, 0x4a, 0xf8, 0x58, 0xb0, 0xa5, 0x56, + 0xa1, 0x5d, 0xf1, 0x66, 0x35, 0x7d, 0x44, 0x08, 0x7f, 0xcd, 0x35, 0x57, 0xc3, 0x4c, 0xc5, 0xec, + 0x32, 0xcc, 0xee, 0xd6, 0x4f, 0xde, 0x35, 0x2b, 0x3b, 0xa8, 0x1e, 0x78, 0xcf, 0xbd, 0x8a, 0x31, + 0x1c, 0xa8, 0x98, 0x32, 0x52, 0xf2, 0x65, 0x96, 0x68, 0x35, 0x65, 0xcb, 0x78, 0x23, 0x57, 0xd2, + 0x9b, 0xa4, 0x72, 0x98, 0xc5, 0xf1, 0x10, 0x17, 0x59, 0x31, 0x8b, 0x80, 0xf0, 0x02, 0x16, 0xa1, + 0x64, 0xd9, 0x8f, 0xf4, 0x94, 0x15, 0x51, 0xc7, 0x31, 0x6d, 0x91, 0x6a, 0x20, 0x52, 0x5f, 0x45, + 0x13, 0xd8, 0x3a, 0x2b, 0xe1, 0x54, 0x5e, 0xa2, 0xb7, 0x49, 0x2d, 0x88, 0x52, 0x5f, 0x86, 0xa9, + 0xb9, 0x6b, 0xd9, 0x5a, 0x8c, 0x86, 0x37, 0xbe, 0x4d, 0x6a, 0xe3, 0x69, 0x3a, 0xe1, 0xbe, 0x30, + 0x96, 0x8a, 0xb1, 0x58, 0x0d, 0x2d, 0x8c, 0x94, 0x8e, 0xc5, 0x28, 0x8d, 0xb4, 0x60, 0xc4, 0x3c, + 0xb2, 0x2d, 0xe9, 0x1d, 0x52, 0xb7, 0xc3, 0xa1, 0x8e, 0x74, 0x2c, 0x58, 0x15, 0xe7, 0x6b, 0x56, + 0x1c, 0x80, 0x46, 0x37, 0x48, 0x51, 0x26, 0x71, 0x94, 0x08, 0x56, 0x6b, 0x15, 0xda, 0x65, 0xcf, + 0x56, 0xb4, 0x49, 0xaa, 0x5a, 0x71, 0xff, 0xd5, 0x10, 0x1b, 0xc0, 0xea, 0xd0, 0x74, 0x8f, 0xa0, + 0xb4, 0x07, 0x0a, 0xbd, 0x4b, 0x56, 0x27, 0x31, 0x9f, 0xc6, 0x51, 0xaa, 0xad, 0x67, 0x15, 0x3d, + 0x75, 0xa7, 0x1a, 0xdb, 0x7d, 0xb2, 0x76, 0x28, 0xe3, 0x58, 0x1e, 0x0b, 0x95, 0x5a, 0xdf, 0x1a, + 0xfa, 0x56, 0x67, 0xb2, 0x31, 0x3e, 0x20, 0xeb, 0x46, 0x89, 0x92, 0xd0, 0x39, 0xd7, 0xd1, 0xb9, + 0x36, 0xd7, 0x8d, 0xf5, 0x0b, 0xb2, 0x31, 0xc9, 0x46, 0x71, 0xe4, 0x0f, 0x0f, 0xf9, 0x6b, 0xa9, + 0x22, 0x2d, 0xdc, 0x05, 0xff, 0xc3, 0x0b, 0xae, 0x9a, 0xd9, 0xa7, 0x6e, 0xd2, 0x5c, 0xd5, 0x24, + 0x55, 0x9b, 0x84, 0x80, 0x6b, 0xce, 0x68, 0xab, 0xd0, 0xae, 0x79, 0x36, 0x1c, 0x3d, 0xae, 0x39, + 0x5d, 0x27, 0x97, 0x33, 0x15, 0xb1, 0x2b, 0xd8, 0x25, 0x18, 0xd2, 0x2d, 0x52, 0x99, 0x08, 0x35, + 0xe6, 0x71, 0x94, 0xbc, 0x62, 0x57, 0x51, 0x9f, 0x0b, 0xf4, 0x4b, 0x52, 0x9f, 0x15, 0x98, 0xae, + 0x6b, 0x98, 0xae, 0xf5, 0x93, 0x77, 0xcd, 0xda, 0x4b, 0x37, 0x01, 0x01, 0xab, 0xcd, 0x6c, 0x07, + 0x2a, 0xde, 0x7e, 0x46, 0x2a, 0x2f, 0x6d, 0x8b, 0x52, 0xfa, 0x35, 0xa9, 0xb8, 0x7e, 0xa5, 0xac, + 0xd0, 0xba, 0xdc, 0xae, 0x3e, 0xd9, 0xea, 0x9c, 0x05, 0xaa, 0xe3, 0xae, 0xf0, 0xe6, 0xf6, 0xed, + 0x5f, 0x4b, 0xa4, 0xec, 0xf4, 0x0b, 0xd9, 0xb8, 0x45, 0x88, 0xaf, 0x04, 0xd7, 0x22, 0x18, 0x72, + 0x6d, 0xe9, 0xa8, 0x58, 0x65, 0x47, 0xd3, 0xab, 0x64, 0xc5, 0x64, 0x03, 0xc9, 0xf0, 0x4c, 0x01, + 0x99, 0x4a, 0x8f, 0xb8, 0x8a, 0x92, 0xd0, 0x61, 0x60, 0x4b, 0xc8, 0x94, 0x18, 0x8f, 0x44, 0x10, + 0xf0, 0x51, 0x2c, 0x86, 0xa3, 0xa9, 0x45, 0xa1, 0x36, 0x17, 0x77, 0xa7, 0x90, 0xda, 0x49, 0xa6, + 0xfc, 0x23, 0x9e, 0x0a, 0xec, 0x8b, 0xc1, 0xa2, 0xea, 0x34, 0x00, 0x0d, 0x5e, 0x86, 0xd2, 0xc7, + 0x52, 0x99, 0xce, 0x19, 0x3a, 0x88, 0x95, 0xc0, 0x70, 0x0a, 0x9f, 0xf2, 0x59, 0x7c, 0x36, 0x49, + 0x39, 0xc8, 0x14, 0x1e, 0x2c, 0xc8, 0xc5, 0xb2, 0x37, 0xab, 0x61, 0x5b, 0xa1, 0x48, 0x94, 0x43, + 0xc2, 0x14, 0xf4, 0x1e, 0x59, 0x83, 0x7d, 0x88, 0x60, 0xa8, 0xa5, 0x0d, 0x4c, 0xd5, 0x64, 0xd6, + 0xc8, 0x03, 0x69, 0x92, 0x72, 0x83, 0x94, 0x35, 0x0f, 0x87, 0xd0, 0x57, 0xa4, 0xa2, 0xe2, 0x95, + 0x34, 0x0f, 0x9f, 0x43, 0x9b, 0x9b, 0xa4, 0xaa, 0x44, 0x2c, 0x60, 0x67, 0x01, 0x9f, 0x62, 0xe4, + 0xeb, 0x1e, 0xb1, 0x52, 0x8f, 0x4f, 0xa1, 0x41, 0xce, 0x30, 0x96, 0x89, 0x3e, 0xc2, 0xb4, 0xd7, + 0xbd, 0x9a, 0x15, 0xbf, 0x07, 0x0d, 0x1a, 0xe4, 0x4c, 0x53, 0xc1, 0x15, 0xe6, 0xbc, 0xee, 0xb9, + 0x3b, 0xff, 0x2c, 0xb8, 0xa2, 0x0d, 0x42, 0x52, 0xad, 0x04, 0x1f, 0x43, 0x4f, 0x31, 0xd7, 0x65, + 0x2f, 0xa7, 0xd0, 0x6d, 0x52, 0x0b, 0xe4, 0x71, 0x12, 0x4b, 0x8e, 0x5d, 0xc7, 0x38, 0x97, 0xbd, + 0x05, 0x0d, 0x02, 0x2d, 0x78, 0xe2, 0x02, 0x2d, 0x78, 0x02, 0x4f, 0x37, 0x83, 0x56, 0x4f, 0x27, + 0xc2, 0x86, 0xba, 0xe6, 0xc4, 0xc1, 0x74, 0x22, 0xe8, 0x67, 0xa4, 0x88, 0x9c, 0xa7, 0xec, 0x1a, + 0x06, 0xf2, 0xc6, 0x79, 0x81, 0x1c, 0x80, 0xc3, 0xb3, 0x46, 0x87, 0xce, 0xc6, 0x1c, 0x9d, 0x0e, + 0x59, 0x89, 0xf9, 0x48, 0xc4, 0xec, 0x7a, 0xab, 0xd0, 0xae, 0x3e, 0x61, 0xe7, 0xdd, 0x03, 0x0e, + 0x75, 0xcf, 0xd8, 0xa0, 0xe7, 0x38, 0x18, 0x46, 0x01, 0x63, 0xf8, 0x52, 0x4a, 0x58, 0xef, 0x63, + 0x84, 0xcd, 0x14, 0x1e, 0x81, 0x37, 0x4c, 0x84, 0x51, 0x79, 0x61, 0x4e, 0xf8, 0x65, 0x38, 0xed, + 0xd9, 0xe6, 0x07, 0x16, 0x42, 0x17, 0xbd, 0x4e, 0x4a, 0xf0, 0x17, 0x96, 0xb9, 0x89, 0xcb, 0x14, + 0xa1, 0xdc, 0x0f, 0x16, 0x59, 0xdf, 0x3a, 0xcd, 0xfa, 0x9d, 0xd3, 0xac, 0xdf, 0xb2, 0x8d, 0xcb, + 0x93, 0xfd, 0x0d, 0x29, 0x0e, 0x4c, 0x3f, 0xe6, 0x2d, 0x2c, 0xfc, 0xc7, 0x16, 0x6e, 0xff, 0x5e, + 0x25, 0x2b, 0xa8, 0x5c, 0x88, 0xf2, 0x16, 0xa9, 0xec, 0x39, 0x70, 0x1d, 0xc9, 0x7b, 0x79, 0x92, + 0x07, 0x79, 0x92, 0x07, 0x8e, 0xe4, 0xfe, 0x22, 0xc9, 0xb6, 0x84, 0x00, 0x7d, 0x9b, 0x83, 0xd6, + 0x81, 0x9c, 0xd7, 0x00, 0xc2, 0x97, 0x73, 0x68, 0x1d, 0xc7, 0x39, 0x09, 0x62, 0xba, 0x33, 0x83, + 0xd6, 0x61, 0xbc, 0xb3, 0x80, 0x71, 0xef, 0x2c, 0xc6, 0xbd, 0x45, 0x8c, 0x7b, 0xa7, 0x30, 0xee, + 0xe5, 0x30, 0x7e, 0x96, 0xc7, 0x18, 0x0b, 0xfa, 0x7f, 0x52, 0xef, 0xe7, 0x79, 0x75, 0x10, 0x2f, + 0x88, 0xb0, 0xf3, 0x81, 0x81, 0xd6, 0x31, 0x6c, 0x4b, 0x78, 0x66, 0x6f, 0x06, 0xac, 0x43, 0x78, + 0xae, 0x40, 0x67, 0xbc, 0x1c, 0xad, 0x8e, 0xe0, 0xbc, 0x06, 0xfb, 0xf2, 0xe6, 0xb4, 0x3a, 0x80, + 0xbd, 0x45, 0x80, 0xfb, 0x67, 0x00, 0xee, 0x2f, 0x00, 0xdc, 0x3b, 0x07, 0xe0, 0xbc, 0x06, 0xfb, + 0xef, 0x6b, 0xae, 0x85, 0x45, 0xd8, 0x14, 0xb0, 0xb3, 0xe7, 0x91, 0x2f, 0x92, 0xd4, 0xe1, 0xeb, + 0x4a, 0x48, 0x08, 0x46, 0x08, 0x30, 0x36, 0xff, 0x8d, 0xbc, 0xb9, 0x00, 0xcf, 0xfc, 0x13, 0x7f, + 0x2d, 0x0e, 0xa5, 0x1a, 0xc3, 0xcb, 0x32, 0xb0, 0xe6, 0x25, 0x7c, 0x5b, 0x76, 0x7d, 0x70, 0x5c, + 0xb7, 0x6f, 0x6b, 0x2e, 0xc1, 0x0a, 0x66, 0x0f, 0x30, 0xcf, 0xcc, 0x0a, 0x33, 0x01, 0xde, 0xe5, + 0x8f, 0x51, 0x20, 0x24, 0x4c, 0x1a, 0x4e, 0x67, 0x35, 0x1c, 0x11, 0xbb, 0x93, 0x31, 0x52, 0xba, + 0xe4, 0xc1, 0x10, 0x56, 0xdb, 0x93, 0xe3, 0xb1, 0x48, 0x34, 0x36, 0xe0, 0x26, 0x36, 0x20, 0x2f, + 0xc1, 0x77, 0xd5, 0x7e, 0xdf, 0xdb, 0xb3, 0x38, 0xe2, 0x18, 0xfa, 0xf6, 0x9d, 0x98, 0xf6, 0xa3, + 0x30, 0xe1, 0x3a, 0x53, 0xc2, 0x81, 0x98, 0xd7, 0xc0, 0x63, 0x6f, 0x63, 0x02, 0xd2, 0xc0, 0x80, + 0x2c, 0x68, 0x90, 0x22, 0xb7, 0x31, 0x63, 0x6a, 0x9a, 0x14, 0x2d, 0x88, 0xe0, 0x82, 0x7f, 0xb1, + 0x23, 0xf7, 0xd9, 0xc3, 0x5a, 0xc6, 0xb5, 0x20, 0xd2, 0x87, 0x64, 0xdd, 0x7e, 0x6c, 0xcc, 0x3e, + 0x52, 0xd8, 0x6d, 0x34, 0x9e, 0xd1, 0xe9, 0x3d, 0xb2, 0xfa, 0x83, 0x8a, 0xc2, 0x28, 0xe1, 0xf1, + 0x53, 0xa9, 0xc6, 0x5c, 0xb3, 0x6d, 0xdc, 0xc1, 0x29, 0x95, 0x7e, 0x4a, 0xae, 0x38, 0x65, 0x4f, + 0x26, 0x5a, 0x24, 0xba, 0x1f, 0xbd, 0x11, 0xec, 0x0e, 0xde, 0xf6, 0xbc, 0x29, 0x78, 0x37, 0x3b, + 0x69, 0x2a, 0x34, 0x7c, 0xcc, 0xb0, 0xbb, 0xf8, 0x79, 0x33, 0x17, 0xa0, 0xdb, 0x96, 0x4b, 0x9c, + 0xbf, 0x87, 0xf3, 0x79, 0x09, 0xba, 0x06, 0x07, 0xa5, 0xfb, 0x6c, 0x62, 0xf7, 0x4d, 0x22, 0xf3, + 0x9a, 0x3b, 0xe8, 0xdb, 0xe7, 0x1c, 0xf4, 0x0f, 0x3e, 0xfe, 0xa0, 0x7f, 0xf8, 0x6f, 0x07, 0xfd, + 0x27, 0x17, 0x1d, 0xf4, 0x8f, 0x3e, 0xf6, 0xa0, 0x7f, 0x7c, 0xf1, 0x41, 0xdf, 0xf9, 0xe0, 0x41, + 0xdf, 0x3d, 0x7b, 0xd0, 0xef, 0x7e, 0xf5, 0xc7, 0x49, 0xa3, 0xf0, 0xf6, 0xa4, 0x51, 0xf8, 0xfb, + 0xa4, 0x51, 0xf8, 0xed, 0x7d, 0xe3, 0xd2, 0xdb, 0xf7, 0x8d, 0x4b, 0x7f, 0xbd, 0x6f, 0x5c, 0xfa, + 0xa5, 0x99, 0xc5, 0x5a, 0x89, 0xce, 0x58, 0x74, 0xed, 0xd3, 0x75, 0x17, 0x7f, 0x3e, 0x8d, 0x8a, + 0xf8, 0x9b, 0xe6, 0xf3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x35, 0x86, 0xaa, 0x9c, 0x57, 0x0d, + 0x00, 0x00, +} + func (m *User) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5022,99 +5117,3 @@ var ( ErrInvalidLengthSoundcloud = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowSoundcloud = fmt.Errorf("proto: integer overflow") ) - -func init() { - proto.RegisterFile("pkg/soundcloud/soundcloud.proto", fileDescriptor_soundcloud_205f1aff27f92dc6) -} - -var fileDescriptor_soundcloud_205f1aff27f92dc6 = []byte{ - // 1394 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x97, 0xdd, 0x72, 0x13, 0xb7, - 0x1b, 0xc6, 0x71, 0x48, 0xfc, 0x21, 0xdb, 0x49, 0xfe, 0x02, 0x82, 0x08, 0xc1, 0x36, 0xe1, 0x0f, - 0x18, 0x0a, 0x76, 0x4b, 0xdb, 0x83, 0xb6, 0x47, 0x49, 0x5c, 0x98, 0x4c, 0x29, 0x65, 0xd6, 0x4e, - 0x3b, 0xed, 0x89, 0x47, 0xde, 0x55, 0x36, 0x3b, 0xac, 0x57, 0x1e, 0xad, 0x96, 0x8c, 0xb9, 0x88, - 0x4e, 0x6f, 0xa3, 0x77, 0xd2, 0x83, 0x1e, 0x70, 0xd8, 0x23, 0xa6, 0x13, 0x6e, 0xa4, 0xf3, 0xbe, - 0x92, 0xec, 0x75, 0x3e, 0x4a, 0x39, 0x8a, 0xde, 0x47, 0xcf, 0xae, 0x56, 0xef, 0x3e, 0x3f, 0x65, - 0x4d, 0x9a, 0x93, 0x57, 0x61, 0x37, 0x95, 0x59, 0x12, 0xf8, 0xb1, 0xcc, 0x82, 0xdc, 0xb0, 0x33, - 0x51, 0x52, 0x4b, 0x4a, 0x7d, 0x1e, 0xfb, 0xa3, 0xe8, 0x4d, 0x67, 0x3e, 0xb3, 0xb9, 0x15, 0x4a, - 0x19, 0xc6, 0xa2, 0xcb, 0x27, 0x51, 0x97, 0x27, 0x89, 0xd4, 0x5c, 0x47, 0x32, 0x49, 0xcd, 0x15, - 0x9b, 0x8f, 0xc3, 0x48, 0x1f, 0x65, 0xa3, 0x8e, 0x2f, 0xc7, 0xdd, 0x50, 0x86, 0xb2, 0x8b, 0xf2, - 0x28, 0x3b, 0xc4, 0x0a, 0x0b, 0x1c, 0x19, 0xfb, 0xf6, 0x9f, 0x2b, 0x64, 0xf9, 0x20, 0x15, 0x8a, - 0x6e, 0x90, 0xa5, 0x28, 0x60, 0x85, 0x56, 0xa1, 0xbd, 0xbc, 0x5b, 0x3c, 0x79, 0xd7, 0x5c, 0xda, - 0xef, 0x79, 0x4b, 0x51, 0x40, 0x37, 0x49, 0x39, 0x4b, 0x85, 0x4a, 0xf8, 0x58, 0xb0, 0xa5, 0x56, - 0xa1, 0x5d, 0xf1, 0x66, 0x35, 0x7d, 0x44, 0x08, 0x7f, 0xcd, 0x35, 0x57, 0xc3, 0x4c, 0xc5, 0xec, - 0x32, 0xcc, 0xee, 0xd6, 0x4f, 0xde, 0x35, 0x2b, 0x3b, 0xa8, 0x1e, 0x78, 0xcf, 0xbd, 0x8a, 0x31, - 0x1c, 0xa8, 0x98, 0x32, 0x52, 0xf2, 0x65, 0x96, 0x68, 0x35, 0x65, 0xcb, 0x78, 0x23, 0x57, 0xd2, - 0x9b, 0xa4, 0x72, 0x98, 0xc5, 0xf1, 0x10, 0x17, 0x59, 0x31, 0x8b, 0x80, 0xf0, 0x02, 0x16, 0xa1, - 0x64, 0xd9, 0x8f, 0xf4, 0x94, 0x15, 0x51, 0xc7, 0x31, 0x6d, 0x91, 0x6a, 0x20, 0x52, 0x5f, 0x45, - 0x13, 0xd8, 0x3a, 0x2b, 0xe1, 0x54, 0x5e, 0xa2, 0xb7, 0x49, 0x2d, 0x88, 0x52, 0x5f, 0x86, 0xa9, - 0xb9, 0x6b, 0xd9, 0x5a, 0x8c, 0x86, 0x37, 0xbe, 0x4d, 0x6a, 0xe3, 0x69, 0x3a, 0xe1, 0xbe, 0x30, - 0x96, 0x8a, 0xb1, 0x58, 0x0d, 0x2d, 0x8c, 0x94, 0x8e, 0xc5, 0x28, 0x8d, 0xb4, 0x60, 0xc4, 0x3c, - 0xb2, 0x2d, 0xe9, 0x1d, 0x52, 0xb7, 0xc3, 0xa1, 0x8e, 0x74, 0x2c, 0x58, 0x15, 0xe7, 0x6b, 0x56, - 0x1c, 0x80, 0x46, 0x37, 0x48, 0x51, 0x26, 0x71, 0x94, 0x08, 0x56, 0x6b, 0x15, 0xda, 0x65, 0xcf, - 0x56, 0xb4, 0x49, 0xaa, 0x5a, 0x71, 0xff, 0xd5, 0x10, 0x1b, 0xc0, 0xea, 0xd0, 0x74, 0x8f, 0xa0, - 0xb4, 0x07, 0x0a, 0xbd, 0x4b, 0x56, 0x27, 0x31, 0x9f, 0xc6, 0x51, 0xaa, 0xad, 0x67, 0x15, 0x3d, - 0x75, 0xa7, 0x1a, 0xdb, 0x7d, 0xb2, 0x76, 0x28, 0xe3, 0x58, 0x1e, 0x0b, 0x95, 0x5a, 0xdf, 0x1a, - 0xfa, 0x56, 0x67, 0xb2, 0x31, 0x3e, 0x20, 0xeb, 0x46, 0x89, 0x92, 0xd0, 0x39, 0xd7, 0xd1, 0xb9, - 0x36, 0xd7, 0x8d, 0xf5, 0x0b, 0xb2, 0x31, 0xc9, 0x46, 0x71, 0xe4, 0x0f, 0x0f, 0xf9, 0x6b, 0xa9, - 0x22, 0x2d, 0xdc, 0x05, 0xff, 0xc3, 0x0b, 0xae, 0x9a, 0xd9, 0xa7, 0x6e, 0xd2, 0x5c, 0xd5, 0x24, - 0x55, 0x9b, 0x84, 0x80, 0x6b, 0xce, 0x68, 0xab, 0xd0, 0xae, 0x79, 0x36, 0x1c, 0x3d, 0xae, 0x39, - 0x5d, 0x27, 0x97, 0x33, 0x15, 0xb1, 0x2b, 0xd8, 0x25, 0x18, 0xd2, 0x2d, 0x52, 0x99, 0x08, 0x35, - 0xe6, 0x71, 0x94, 0xbc, 0x62, 0x57, 0x51, 0x9f, 0x0b, 0xf4, 0x4b, 0x52, 0x9f, 0x15, 0x98, 0xae, - 0x6b, 0x98, 0xae, 0xf5, 0x93, 0x77, 0xcd, 0xda, 0x4b, 0x37, 0x01, 0x01, 0xab, 0xcd, 0x6c, 0x07, - 0x2a, 0xde, 0x7e, 0x46, 0x2a, 0x2f, 0x6d, 0x8b, 0x52, 0xfa, 0x35, 0xa9, 0xb8, 0x7e, 0xa5, 0xac, - 0xd0, 0xba, 0xdc, 0xae, 0x3e, 0xd9, 0xea, 0x9c, 0x05, 0xaa, 0xe3, 0xae, 0xf0, 0xe6, 0xf6, 0xed, - 0x5f, 0x4b, 0xa4, 0xec, 0xf4, 0x0b, 0xd9, 0xb8, 0x45, 0x88, 0xaf, 0x04, 0xd7, 0x22, 0x18, 0x72, - 0x6d, 0xe9, 0xa8, 0x58, 0x65, 0x47, 0xd3, 0xab, 0x64, 0xc5, 0x64, 0x03, 0xc9, 0xf0, 0x4c, 0x01, - 0x99, 0x4a, 0x8f, 0xb8, 0x8a, 0x92, 0xd0, 0x61, 0x60, 0x4b, 0xc8, 0x94, 0x18, 0x8f, 0x44, 0x10, - 0xf0, 0x51, 0x2c, 0x86, 0xa3, 0xa9, 0x45, 0xa1, 0x36, 0x17, 0x77, 0xa7, 0x90, 0xda, 0x49, 0xa6, - 0xfc, 0x23, 0x9e, 0x0a, 0xec, 0x8b, 0xc1, 0xa2, 0xea, 0x34, 0x00, 0x0d, 0x5e, 0x86, 0xd2, 0xc7, - 0x52, 0x99, 0xce, 0x19, 0x3a, 0x88, 0x95, 0xc0, 0x70, 0x0a, 0x9f, 0xf2, 0x59, 0x7c, 0x36, 0x49, - 0x39, 0xc8, 0x14, 0x1e, 0x2c, 0xc8, 0xc5, 0xb2, 0x37, 0xab, 0x61, 0x5b, 0xa1, 0x48, 0x94, 0x43, - 0xc2, 0x14, 0xf4, 0x1e, 0x59, 0x83, 0x7d, 0x88, 0x60, 0xa8, 0xa5, 0x0d, 0x4c, 0xd5, 0x64, 0xd6, - 0xc8, 0x03, 0x69, 0x92, 0x72, 0x83, 0x94, 0x35, 0x0f, 0x87, 0xd0, 0x57, 0xa4, 0xa2, 0xe2, 0x95, - 0x34, 0x0f, 0x9f, 0x43, 0x9b, 0x9b, 0xa4, 0xaa, 0x44, 0x2c, 0x60, 0x67, 0x01, 0x9f, 0x62, 0xe4, - 0xeb, 0x1e, 0xb1, 0x52, 0x8f, 0x4f, 0xa1, 0x41, 0xce, 0x30, 0x96, 0x89, 0x3e, 0xc2, 0xb4, 0xd7, - 0xbd, 0x9a, 0x15, 0xbf, 0x07, 0x0d, 0x1a, 0xe4, 0x4c, 0x53, 0xc1, 0x15, 0xe6, 0xbc, 0xee, 0xb9, - 0x3b, 0xff, 0x2c, 0xb8, 0xa2, 0x0d, 0x42, 0x52, 0xad, 0x04, 0x1f, 0x43, 0x4f, 0x31, 0xd7, 0x65, - 0x2f, 0xa7, 0xd0, 0x6d, 0x52, 0x0b, 0xe4, 0x71, 0x12, 0x4b, 0x8e, 0x5d, 0xc7, 0x38, 0x97, 0xbd, - 0x05, 0x0d, 0x02, 0x2d, 0x78, 0xe2, 0x02, 0x2d, 0x78, 0x02, 0x4f, 0x37, 0x83, 0x56, 0x4f, 0x27, - 0xc2, 0x86, 0xba, 0xe6, 0xc4, 0xc1, 0x74, 0x22, 0xe8, 0x67, 0xa4, 0x88, 0x9c, 0xa7, 0xec, 0x1a, - 0x06, 0xf2, 0xc6, 0x79, 0x81, 0x1c, 0x80, 0xc3, 0xb3, 0x46, 0x87, 0xce, 0xc6, 0x1c, 0x9d, 0x0e, - 0x59, 0x89, 0xf9, 0x48, 0xc4, 0xec, 0x7a, 0xab, 0xd0, 0xae, 0x3e, 0x61, 0xe7, 0xdd, 0x03, 0x0e, - 0x75, 0xcf, 0xd8, 0xa0, 0xe7, 0x38, 0x18, 0x46, 0x01, 0x63, 0xf8, 0x52, 0x4a, 0x58, 0xef, 0x63, - 0x84, 0xcd, 0x14, 0x1e, 0x81, 0x37, 0x4c, 0x84, 0x51, 0x79, 0x61, 0x4e, 0xf8, 0x65, 0x38, 0xed, - 0xd9, 0xe6, 0x07, 0x16, 0x42, 0x17, 0xbd, 0x4e, 0x4a, 0xf0, 0x17, 0x96, 0xb9, 0x89, 0xcb, 0x14, - 0xa1, 0xdc, 0x0f, 0x16, 0x59, 0xdf, 0x3a, 0xcd, 0xfa, 0x9d, 0xd3, 0xac, 0xdf, 0xb2, 0x8d, 0xcb, - 0x93, 0xfd, 0x0d, 0x29, 0x0e, 0x4c, 0x3f, 0xe6, 0x2d, 0x2c, 0xfc, 0xc7, 0x16, 0x6e, 0xff, 0x5e, - 0x25, 0x2b, 0xa8, 0x5c, 0x88, 0xf2, 0x16, 0xa9, 0xec, 0x39, 0x70, 0x1d, 0xc9, 0x7b, 0x79, 0x92, - 0x07, 0x79, 0x92, 0x07, 0x8e, 0xe4, 0xfe, 0x22, 0xc9, 0xb6, 0x84, 0x00, 0x7d, 0x9b, 0x83, 0xd6, - 0x81, 0x9c, 0xd7, 0x00, 0xc2, 0x97, 0x73, 0x68, 0x1d, 0xc7, 0x39, 0x09, 0x62, 0xba, 0x33, 0x83, - 0xd6, 0x61, 0xbc, 0xb3, 0x80, 0x71, 0xef, 0x2c, 0xc6, 0xbd, 0x45, 0x8c, 0x7b, 0xa7, 0x30, 0xee, - 0xe5, 0x30, 0x7e, 0x96, 0xc7, 0x18, 0x0b, 0xfa, 0x7f, 0x52, 0xef, 0xe7, 0x79, 0x75, 0x10, 0x2f, - 0x88, 0xb0, 0xf3, 0x81, 0x81, 0xd6, 0x31, 0x6c, 0x4b, 0x78, 0x66, 0x6f, 0x06, 0xac, 0x43, 0x78, - 0xae, 0x40, 0x67, 0xbc, 0x1c, 0xad, 0x8e, 0xe0, 0xbc, 0x06, 0xfb, 0xf2, 0xe6, 0xb4, 0x3a, 0x80, - 0xbd, 0x45, 0x80, 0xfb, 0x67, 0x00, 0xee, 0x2f, 0x00, 0xdc, 0x3b, 0x07, 0xe0, 0xbc, 0x06, 0xfb, - 0xef, 0x6b, 0xae, 0x85, 0x45, 0xd8, 0x14, 0xb0, 0xb3, 0xe7, 0x91, 0x2f, 0x92, 0xd4, 0xe1, 0xeb, - 0x4a, 0x48, 0x08, 0x46, 0x08, 0x30, 0x36, 0xff, 0x8d, 0xbc, 0xb9, 0x00, 0xcf, 0xfc, 0x13, 0x7f, - 0x2d, 0x0e, 0xa5, 0x1a, 0xc3, 0xcb, 0x32, 0xb0, 0xe6, 0x25, 0x7c, 0x5b, 0x76, 0x7d, 0x70, 0x5c, - 0xb7, 0x6f, 0x6b, 0x2e, 0xc1, 0x0a, 0x66, 0x0f, 0x30, 0xcf, 0xcc, 0x0a, 0x33, 0x01, 0xde, 0xe5, - 0x8f, 0x51, 0x20, 0x24, 0x4c, 0x1a, 0x4e, 0x67, 0x35, 0x1c, 0x11, 0xbb, 0x93, 0x31, 0x52, 0xba, - 0xe4, 0xc1, 0x10, 0x56, 0xdb, 0x93, 0xe3, 0xb1, 0x48, 0x34, 0x36, 0xe0, 0x26, 0x36, 0x20, 0x2f, - 0xc1, 0x77, 0xd5, 0x7e, 0xdf, 0xdb, 0xb3, 0x38, 0xe2, 0x18, 0xfa, 0xf6, 0x9d, 0x98, 0xf6, 0xa3, - 0x30, 0xe1, 0x3a, 0x53, 0xc2, 0x81, 0x98, 0xd7, 0xc0, 0x63, 0x6f, 0x63, 0x02, 0xd2, 0xc0, 0x80, - 0x2c, 0x68, 0x90, 0x22, 0xb7, 0x31, 0x63, 0x6a, 0x9a, 0x14, 0x2d, 0x88, 0xe0, 0x82, 0x7f, 0xb1, - 0x23, 0xf7, 0xd9, 0xc3, 0x5a, 0xc6, 0xb5, 0x20, 0xd2, 0x87, 0x64, 0xdd, 0x7e, 0x6c, 0xcc, 0x3e, - 0x52, 0xd8, 0x6d, 0x34, 0x9e, 0xd1, 0xe9, 0x3d, 0xb2, 0xfa, 0x83, 0x8a, 0xc2, 0x28, 0xe1, 0xf1, - 0x53, 0xa9, 0xc6, 0x5c, 0xb3, 0x6d, 0xdc, 0xc1, 0x29, 0x95, 0x7e, 0x4a, 0xae, 0x38, 0x65, 0x4f, - 0x26, 0x5a, 0x24, 0xba, 0x1f, 0xbd, 0x11, 0xec, 0x0e, 0xde, 0xf6, 0xbc, 0x29, 0x78, 0x37, 0x3b, - 0x69, 0x2a, 0x34, 0x7c, 0xcc, 0xb0, 0xbb, 0xf8, 0x79, 0x33, 0x17, 0xa0, 0xdb, 0x96, 0x4b, 0x9c, - 0xbf, 0x87, 0xf3, 0x79, 0x09, 0xba, 0x06, 0x07, 0xa5, 0xfb, 0x6c, 0x62, 0xf7, 0x4d, 0x22, 0xf3, - 0x9a, 0x3b, 0xe8, 0xdb, 0xe7, 0x1c, 0xf4, 0x0f, 0x3e, 0xfe, 0xa0, 0x7f, 0xf8, 0x6f, 0x07, 0xfd, - 0x27, 0x17, 0x1d, 0xf4, 0x8f, 0x3e, 0xf6, 0xa0, 0x7f, 0x7c, 0xf1, 0x41, 0xdf, 0xf9, 0xe0, 0x41, - 0xdf, 0x3d, 0x7b, 0xd0, 0xef, 0x7e, 0xf5, 0xc7, 0x49, 0xa3, 0xf0, 0xf6, 0xa4, 0x51, 0xf8, 0xfb, - 0xa4, 0x51, 0xf8, 0xed, 0x7d, 0xe3, 0xd2, 0xdb, 0xf7, 0x8d, 0x4b, 0x7f, 0xbd, 0x6f, 0x5c, 0xfa, - 0xa5, 0x99, 0xc5, 0x5a, 0x89, 0xce, 0x58, 0x74, 0xed, 0xd3, 0x75, 0x17, 0x7f, 0x3e, 0x8d, 0x8a, - 0xf8, 0x9b, 0xe6, 0xf3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x35, 0x86, 0xaa, 0x9c, 0x57, 0x0d, - 0x00, 0x00, -}