Removing superfluous image types

Additionally updating the protobufs that use ImageType
This commit is contained in:
Samuel Hawksby-Robinson 2020-10-22 14:19:25 +01:00 committed by Andrea Maria Piana
parent c6accd8ce3
commit 7f8d3674d4
4 changed files with 87 additions and 95 deletions

View File

@ -13,10 +13,6 @@ const (
PNG
GIF
WEBP
// Vector image types
SVG
AI
)
type Details struct {

View File

@ -20,40 +20,6 @@ var _ = math.Inf
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type ImageMessage_ImageType int32
const (
ImageMessage_UNKNOWN_IMAGE_TYPE ImageMessage_ImageType = 0
ImageMessage_PNG ImageMessage_ImageType = 1
ImageMessage_JPEG ImageMessage_ImageType = 2
ImageMessage_WEBP ImageMessage_ImageType = 3
ImageMessage_GIF ImageMessage_ImageType = 4
)
var ImageMessage_ImageType_name = map[int32]string{
0: "UNKNOWN_IMAGE_TYPE",
1: "PNG",
2: "JPEG",
3: "WEBP",
4: "GIF",
}
var ImageMessage_ImageType_value = map[string]int32{
"UNKNOWN_IMAGE_TYPE": 0,
"PNG": 1,
"JPEG": 2,
"WEBP": 3,
"GIF": 4,
}
func (x ImageMessage_ImageType) String() string {
return proto.EnumName(ImageMessage_ImageType_name, int32(x))
}
func (ImageMessage_ImageType) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_263952f55fd35689, []int{1, 0}
}
type AudioMessage_AudioType int32
const (
@ -177,11 +143,11 @@ func (m *StickerMessage) GetPack() int32 {
}
type ImageMessage struct {
Payload []byte `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
Type ImageMessage_ImageType `protobuf:"varint,2,opt,name=type,proto3,enum=protobuf.ImageMessage_ImageType" json:"type,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
Payload []byte `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
Type ImageType `protobuf:"varint,2,opt,name=type,proto3,enum=protobuf.ImageType" json:"type,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *ImageMessage) Reset() { *m = ImageMessage{} }
@ -216,11 +182,11 @@ func (m *ImageMessage) GetPayload() []byte {
return nil
}
func (m *ImageMessage) GetType() ImageMessage_ImageType {
func (m *ImageMessage) GetType() ImageType {
if m != nil {
return m.Type
}
return ImageMessage_UNKNOWN_IMAGE_TYPE
return ImageType_UNKNOWN_IMAGE_TYPE
}
type AudioMessage struct {
@ -450,7 +416,6 @@ func (*ChatMessage) XXX_OneofWrappers() []interface{} {
}
func init() {
proto.RegisterEnum("protobuf.ImageMessage_ImageType", ImageMessage_ImageType_name, ImageMessage_ImageType_value)
proto.RegisterEnum("protobuf.AudioMessage_AudioType", AudioMessage_AudioType_name, AudioMessage_AudioType_value)
proto.RegisterEnum("protobuf.ChatMessage_ContentType", ChatMessage_ContentType_name, ChatMessage_ContentType_value)
proto.RegisterType((*StickerMessage)(nil), "protobuf.StickerMessage")
@ -464,44 +429,42 @@ func init() {
}
var fileDescriptor_263952f55fd35689 = []byte{
// 618 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x4f, 0x6f, 0x9b, 0x4e,
0x10, 0x0d, 0x36, 0x18, 0x33, 0x58, 0xd1, 0x6a, 0x7f, 0xf9, 0x25, 0xb4, 0xaa, 0x54, 0x17, 0xf5,
0xe0, 0x93, 0x0f, 0x69, 0x2a, 0xe5, 0x4a, 0x1c, 0xea, 0x90, 0x14, 0x8c, 0x96, 0x75, 0xd3, 0x9c,
0x10, 0xc1, 0xdb, 0xd8, 0x4a, 0xf8, 0x23, 0xb3, 0x96, 0x9a, 0x6b, 0xbf, 0x4d, 0xef, 0x55, 0x3f,
0x5f, 0xb5, 0x4b, 0x08, 0xb4, 0xea, 0xad, 0x27, 0x66, 0x66, 0xdf, 0x5b, 0xde, 0xcc, 0xbc, 0x05,
0x9c, 0xae, 0x13, 0x1e, 0x67, 0xac, 0xaa, 0x92, 0x3b, 0x36, 0x2d, 0xb7, 0x05, 0x2f, 0xf0, 0x50,
0x7e, 0x6e, 0x77, 0x5f, 0x5e, 0x9a, 0x2c, 0xdf, 0x65, 0x55, 0x5d, 0xb6, 0x4f, 0x61, 0x3f, 0xe2,
0x9b, 0xf4, 0x9e, 0x6d, 0xfd, 0x1a, 0x8e, 0x31, 0xa8, 0xeb, 0xa4, 0x5a, 0x5b, 0xca, 0x58, 0x99,
0x18, 0x44, 0xc6, 0xa2, 0x56, 0x26, 0xe9, 0xbd, 0xd5, 0x1b, 0x2b, 0x13, 0x8d, 0xc8, 0xd8, 0xfe,
0xae, 0xc0, 0xc8, 0xcb, 0x92, 0x3b, 0xd6, 0x10, 0x2d, 0xd0, 0xcb, 0xe4, 0xf1, 0xa1, 0x48, 0x56,
0x92, 0x3b, 0x22, 0x4d, 0x8a, 0x4f, 0x40, 0xe5, 0x8f, 0x25, 0x93, 0xf4, 0xfd, 0xe3, 0xf1, 0xb4,
0x91, 0x32, 0xed, 0xf2, 0xeb, 0x84, 0x3e, 0x96, 0x8c, 0x48, 0xb4, 0xed, 0x81, 0xf1, 0x5c, 0xc2,
0x87, 0x80, 0x97, 0xc1, 0x55, 0xb0, 0xb8, 0x0e, 0x62, 0xcf, 0x77, 0xe6, 0x6e, 0x4c, 0x6f, 0x42,
0x17, 0xed, 0x61, 0x1d, 0xfa, 0x61, 0x30, 0x47, 0x0a, 0x1e, 0x82, 0x7a, 0x19, 0xba, 0x73, 0xd4,
0x13, 0xd1, 0xb5, 0x7b, 0x16, 0xa2, 0xbe, 0x38, 0x9c, 0x7b, 0x1f, 0x90, 0x6a, 0xff, 0x54, 0x60,
0xe4, 0xec, 0x56, 0x9b, 0xe2, 0x1f, 0xb4, 0x76, 0xf9, 0x75, 0xd2, 0x6a, 0xc5, 0xaf, 0xc1, 0x5c,
0xed, 0xb6, 0x09, 0xdf, 0x14, 0x79, 0x9c, 0x55, 0x56, 0x7f, 0xac, 0x4c, 0x54, 0x02, 0x4d, 0xc9,
0xaf, 0xec, 0xf7, 0x60, 0x3c, 0x73, 0xba, 0xcd, 0x38, 0xcb, 0x73, 0x6f, 0xd1, 0x69, 0xc6, 0x71,
0x66, 0x48, 0x91, 0x81, 0x4f, 0x50, 0xcf, 0xfe, 0xa6, 0x81, 0x39, 0x5b, 0x27, 0xbc, 0xd1, 0x7d,
0x00, 0x5a, 0xfa, 0x50, 0xa4, 0xf7, 0x52, 0xb5, 0x4a, 0xea, 0x04, 0xbf, 0x02, 0x83, 0x6f, 0x32,
0x56, 0xf1, 0x24, 0x2b, 0xa5, 0x70, 0x95, 0xb4, 0x05, 0xb1, 0x3c, 0xce, 0xbe, 0x72, 0x29, 0xca,
0x20, 0x32, 0x16, 0x7a, 0xb7, 0xac, 0x2a, 0x8b, 0xbc, 0x62, 0x31, 0x2f, 0x2c, 0x55, 0x1e, 0x41,
0x53, 0xa2, 0x05, 0x7e, 0x01, 0x43, 0x96, 0x57, 0x71, 0x9e, 0x64, 0xcc, 0xd2, 0xe4, 0xa9, 0xce,
0xf2, 0x2a, 0x48, 0x32, 0x86, 0x8f, 0x40, 0x97, 0xfe, 0xda, 0xac, 0xac, 0x81, 0x3c, 0x19, 0x88,
0xd4, 0x5b, 0xe1, 0x53, 0x18, 0x3d, 0x79, 0x2e, 0x96, 0x23, 0xd4, 0xe5, 0x08, 0xff, 0x6f, 0x47,
0xf8, 0xd4, 0x85, 0x9c, 0x9b, 0x99, 0xb5, 0x09, 0x3e, 0x87, 0x51, 0x5a, 0xe4, 0x9c, 0xe5, 0xbc,
0x66, 0x0e, 0x25, 0xf3, 0x4d, 0xcb, 0xec, 0xcc, 0x60, 0x3a, 0xab, 0x91, 0xf5, 0x2d, 0x69, 0x9b,
0xe0, 0x13, 0xd0, 0xab, 0xda, 0xcb, 0x96, 0x31, 0x56, 0x26, 0xe6, 0xb1, 0xd5, 0x5e, 0xf0, 0xbb,
0xc9, 0x2f, 0xf6, 0x48, 0x03, 0xc5, 0x53, 0xd0, 0x36, 0xc2, 0x66, 0x16, 0x48, 0xce, 0xe1, 0xdf,
0xdd, 0x79, 0xb1, 0x47, 0x6a, 0x98, 0xc0, 0x27, 0x62, 0x93, 0x96, 0xf9, 0x27, 0xbe, 0xeb, 0x10,
0x81, 0x97, 0x30, 0xfb, 0x87, 0x02, 0x66, 0x47, 0x32, 0xb6, 0xe0, 0xa0, 0x59, 0xfe, 0x6c, 0x11,
0x50, 0x37, 0xa0, 0xcd, 0xfa, 0xf7, 0x01, 0xa8, 0xfb, 0x99, 0xc6, 0xe1, 0x47, 0xc7, 0x0b, 0x90,
0x82, 0x4d, 0xd0, 0x23, 0xea, 0xcd, 0xae, 0x5c, 0x82, 0x7a, 0x18, 0x60, 0x10, 0x51, 0x87, 0x2e,
0x23, 0xd4, 0xc7, 0x06, 0x68, 0xae, 0xbf, 0xb8, 0xf4, 0x90, 0x8a, 0x8f, 0xe0, 0x3f, 0x4a, 0x9c,
0x20, 0x72, 0x66, 0xd4, 0x5b, 0x88, 0x1b, 0x7d, 0xdf, 0x09, 0xce, 0x91, 0x86, 0x27, 0xf0, 0x36,
0xba, 0x89, 0xa8, 0xeb, 0xc7, 0xbe, 0x1b, 0x45, 0xe2, 0xc5, 0x34, 0x7f, 0x0b, 0x89, 0xf7, 0xc9,
0xa1, 0x6e, 0x3c, 0x27, 0x8b, 0x65, 0x88, 0x06, 0xe2, 0x36, 0xf9, 0xa4, 0x90, 0x2e, 0x42, 0x69,
0x48, 0x34, 0x3c, 0x33, 0x9e, 0x5f, 0xc8, 0xed, 0x40, 0x76, 0xf8, 0xee, 0x57, 0x00, 0x00, 0x00,
0xff, 0xff, 0xef, 0xa1, 0x83, 0xb2, 0x57, 0x04, 0x00, 0x00,
// 583 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x4f, 0x4f, 0xdb, 0x4e,
0x10, 0xc5, 0x60, 0xc7, 0xf1, 0x38, 0x42, 0xd6, 0xc2, 0x0f, 0xfc, 0xab, 0x2a, 0x35, 0x8d, 0x2a,
0x35, 0xa7, 0x1c, 0x28, 0x95, 0xb8, 0xba, 0xc1, 0xa2, 0x2e, 0xb5, 0x93, 0xae, 0x37, 0x6d, 0x39,
0x59, 0x8b, 0xb3, 0x25, 0x16, 0xf8, 0x8f, 0xb2, 0x1b, 0xa9, 0x5c, 0xfb, 0x99, 0xaa, 0x7e, 0xbe,
0xca, 0x63, 0x8c, 0x03, 0x97, 0x9e, 0x32, 0x33, 0xfb, 0xde, 0xf3, 0xdb, 0xd9, 0x17, 0x20, 0xe9,
0x8a, 0xab, 0x24, 0x17, 0x52, 0xf2, 0x1b, 0x31, 0xa9, 0xd6, 0xa5, 0x2a, 0x49, 0x1f, 0x7f, 0xae,
0x37, 0x3f, 0x5e, 0xd8, 0xa2, 0xd8, 0xe4, 0xb2, 0x19, 0x8f, 0xce, 0x60, 0x3f, 0x56, 0x59, 0x7a,
0x2b, 0xd6, 0x61, 0x03, 0x27, 0x04, 0xf4, 0x15, 0x97, 0x2b, 0x57, 0x1b, 0x6a, 0x63, 0x8b, 0x62,
0x5d, 0xcf, 0x2a, 0x9e, 0xde, 0xba, 0xbb, 0x43, 0x6d, 0x6c, 0x50, 0xac, 0x47, 0x5f, 0x60, 0x10,
0xe4, 0xfc, 0x46, 0xb4, 0x3c, 0x17, 0xcc, 0x8a, 0xdf, 0xdf, 0x95, 0x7c, 0x89, 0xd4, 0x01, 0x6d,
0x5b, 0xf2, 0x16, 0x74, 0x75, 0x5f, 0x09, 0x64, 0xef, 0x9f, 0x1c, 0x4c, 0x5a, 0x27, 0x13, 0xe4,
0xb3, 0xfb, 0x4a, 0x50, 0x04, 0x8c, 0xfe, 0x68, 0x30, 0xf0, 0x36, 0xcb, 0xac, 0xfc, 0xb7, 0xe6,
0xe9, 0x13, 0xcd, 0x61, 0xa7, 0xb9, 0xcd, 0x6f, 0x9a, 0xee, 0x03, 0xe4, 0x15, 0xd8, 0xcb, 0xcd,
0x9a, 0xab, 0xac, 0x2c, 0x92, 0x5c, 0xba, 0x7b, 0x43, 0x6d, 0xac, 0x53, 0x68, 0x47, 0xa1, 0x1c,
0xbd, 0x07, 0xeb, 0x91, 0x43, 0x8e, 0x80, 0x2c, 0xa2, 0xcb, 0x68, 0xf6, 0x2d, 0x4a, 0xbc, 0xc5,
0x79, 0x30, 0x4b, 0xd8, 0xd5, 0xdc, 0x77, 0x76, 0x88, 0x09, 0x7b, 0x9e, 0x37, 0x75, 0x34, 0x2c,
0x42, 0xea, 0xec, 0x8e, 0x7e, 0x19, 0x60, 0x4f, 0x57, 0x5c, 0xb5, 0xbe, 0x0f, 0xc1, 0x48, 0xef,
0xca, 0xf4, 0x16, 0x5d, 0xeb, 0xb4, 0x69, 0xc8, 0x4b, 0xb0, 0x54, 0x96, 0x0b, 0xa9, 0x78, 0x5e,
0xa1, 0x71, 0x9d, 0x76, 0x83, 0x7a, 0xc7, 0x4a, 0xfc, 0x54, 0x68, 0xca, 0xa2, 0x58, 0xd7, 0x7e,
0xd7, 0x42, 0x56, 0x65, 0x21, 0x45, 0xa2, 0x4a, 0x57, 0xc7, 0x23, 0x68, 0x47, 0xac, 0x24, 0xff,
0x43, 0x5f, 0x14, 0x32, 0x29, 0x78, 0x2e, 0x5c, 0x03, 0x4f, 0x4d, 0x51, 0xc8, 0x88, 0xe7, 0x82,
0x1c, 0x83, 0x89, 0x31, 0xc8, 0x96, 0x6e, 0x0f, 0x4f, 0x7a, 0x75, 0x1b, 0x2c, 0xc9, 0x19, 0x0c,
0x1e, 0xa2, 0x91, 0xe0, 0x0a, 0x4d, 0x5c, 0xe1, 0x7f, 0xdd, 0x0a, 0x1f, 0x6e, 0x81, 0x7b, 0xb3,
0xf3, 0xae, 0x21, 0xe7, 0x30, 0x48, 0xcb, 0x42, 0x89, 0x42, 0x35, 0xcc, 0x3e, 0x32, 0x5f, 0x77,
0xcc, 0xad, 0x1d, 0x4c, 0xa6, 0x0d, 0xb2, 0x51, 0x49, 0xbb, 0x86, 0x9c, 0x82, 0x29, 0x9b, 0xc8,
0xb9, 0xd6, 0x50, 0x1b, 0xdb, 0x27, 0x6e, 0x27, 0xf0, 0x34, 0x8b, 0x1f, 0x77, 0x68, 0x0b, 0x25,
0x13, 0x30, 0xb2, 0x3a, 0x2e, 0x2e, 0x20, 0xe7, 0xe8, 0x59, 0x8a, 0x3a, 0x46, 0x03, 0xab, 0xf1,
0xbc, 0x7e, 0x49, 0xd7, 0x7e, 0x8e, 0xdf, 0x4e, 0x48, 0x8d, 0x47, 0xd8, 0xe8, 0xb7, 0x06, 0xf6,
0x96, 0x65, 0xe2, 0xc2, 0x61, 0xfb, 0xf8, 0xd3, 0x59, 0xc4, 0xfc, 0x88, 0xb5, 0xcf, 0xbf, 0x0f,
0xc0, 0xfc, 0xef, 0x2c, 0x99, 0x7f, 0xf6, 0x82, 0xc8, 0xd1, 0x88, 0x0d, 0x66, 0xcc, 0x82, 0xe9,
0xa5, 0x4f, 0x9d, 0x5d, 0x02, 0xd0, 0x8b, 0x99, 0xc7, 0x16, 0xb1, 0xb3, 0x47, 0x2c, 0x30, 0xfc,
0x70, 0xf6, 0x29, 0x70, 0x74, 0x72, 0x0c, 0x07, 0x8c, 0x7a, 0x51, 0xec, 0x4d, 0x59, 0x30, 0xab,
0x15, 0xc3, 0xd0, 0x8b, 0xce, 0x1d, 0x83, 0x8c, 0xe1, 0x4d, 0x7c, 0x15, 0x33, 0x3f, 0x4c, 0x42,
0x3f, 0x8e, 0xbd, 0x0b, 0xff, 0xf1, 0x6b, 0x73, 0x1a, 0x7c, 0xf5, 0x98, 0x9f, 0x5c, 0xd0, 0xd9,
0x62, 0xee, 0xf4, 0x6a, 0xb5, 0x20, 0xf4, 0x2e, 0x7c, 0xc7, 0xac, 0x4b, 0x0c, 0xa4, 0xd3, 0xff,
0x60, 0x3d, 0xfe, 0x43, 0xae, 0x7b, 0x78, 0xc3, 0x77, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xda,
0xca, 0x09, 0x0a, 0xfe, 0x03, 0x00, 0x00,
}

View File

@ -55,8 +55,44 @@ func (MessageType) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_888b6bd9597961ff, []int{0}
}
type ImageType int32
const (
ImageType_UNKNOWN_IMAGE_TYPE ImageType = 0
// Raster image files is payload data that can be read as a raster image
ImageType_PNG ImageType = 1
ImageType_JPEG ImageType = 2
ImageType_WEBP ImageType = 3
ImageType_GIF ImageType = 4
)
var ImageType_name = map[int32]string{
0: "UNKNOWN_IMAGE_TYPE",
1: "PNG",
2: "JPEG",
3: "WEBP",
4: "GIF",
}
var ImageType_value = map[string]int32{
"UNKNOWN_IMAGE_TYPE": 0,
"PNG": 1,
"JPEG": 2,
"WEBP": 3,
"GIF": 4,
}
func (x ImageType) String() string {
return proto.EnumName(ImageType_name, int32(x))
}
func (ImageType) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_888b6bd9597961ff, []int{1}
}
func init() {
proto.RegisterEnum("protobuf.MessageType", MessageType_name, MessageType_value)
proto.RegisterEnum("protobuf.ImageType", ImageType_name, ImageType_value)
}
func init() {
@ -64,7 +100,7 @@ func init() {
}
var fileDescriptor_888b6bd9597961ff = []byte{
// 153 bytes of a gzipped FileDescriptorProto
// 203 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4e, 0xcd, 0x2b, 0xcd,
0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x00, 0x53, 0x49, 0xa5, 0x69, 0x5a, 0x75,
0x5c, 0xdc, 0xbe, 0xa9, 0xc5, 0xc5, 0x89, 0xe9, 0xa9, 0x21, 0x95, 0x05, 0xa9, 0x42, 0x12, 0x5c,
@ -73,6 +109,9 @@ var fileDescriptor_888b6bd9597961ff = []byte{
0xfe, 0xf1, 0xfe, 0x7e, 0xae, 0x02, 0x8c, 0x42, 0x02, 0x5c, 0x3c, 0x01, 0xa1, 0x4e, 0x3e, 0x9e,
0xce, 0xf1, 0xee, 0x41, 0xfe, 0xa1, 0x01, 0x02, 0x4c, 0x42, 0x82, 0x5c, 0xbc, 0x01, 0x41, 0x9e,
0x61, 0x8e, 0x21, 0xae, 0x50, 0x21, 0x66, 0x21, 0x05, 0x2e, 0x99, 0xe0, 0xc8, 0xe0, 0x10, 0x57,
0x5f, 0xb8, 0x69, 0xa8, 0x2a, 0x58, 0x92, 0xd8, 0xc0, 0x2e, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff,
0xff, 0xa7, 0x40, 0x6b, 0x1d, 0x9f, 0x00, 0x00, 0x00,
0x5f, 0xb8, 0x69, 0xa8, 0x2a, 0x58, 0xb4, 0x3c, 0xb9, 0x38, 0x3d, 0x73, 0x61, 0xb6, 0x8b, 0x71,
0x09, 0xc1, 0x6c, 0xf7, 0xf4, 0x45, 0xb2, 0x9b, 0x9d, 0x8b, 0x39, 0xc0, 0xcf, 0x5d, 0x80, 0x51,
0x88, 0x83, 0x8b, 0xc5, 0x2b, 0xc0, 0xd5, 0x5d, 0x80, 0x09, 0xc4, 0x0a, 0x77, 0x75, 0x02, 0xd9,
0xc1, 0xce, 0xc5, 0xec, 0xee, 0xe9, 0x26, 0xc0, 0x92, 0xc4, 0x06, 0xf6, 0x94, 0x31, 0x20, 0x00,
0x00, 0xff, 0xff, 0xe0, 0xb8, 0x97, 0x7f, 0xea, 0x00, 0x00, 0x00,
}

View File

@ -19,10 +19,4 @@ enum ImageType {
JPEG = 2;
WEBP = 3;
GIF = 4;
// Vector image files is payload data that can be interpreted as a vector image
SVG = 101;
// AVATAR is payload data that can be parsed as avatar compilation instructions
AVATAR = 201;
}