From ee7025a573ef2d9b7ac7f4be58ef914d9d03575d Mon Sep 17 00:00:00 2001 From: Patryk Osmaczko Date: Tue, 24 May 2022 21:20:13 +0200 Subject: [PATCH] feat: add intro/outro message to communities --- protocol/communities/community.go | 30 +++ protocol/protobuf/communities.pb.go | 178 ++++++++++-------- protocol/protobuf/communities.proto | 2 + protocol/requests/create_community_request.go | 33 +++- protocol/requests/edit_community.go | 27 +-- services/chat/api.go | 30 +-- 6 files changed, 177 insertions(+), 123 deletions(-) diff --git a/protocol/communities/community.go b/protocol/communities/community.go index f3f15688e..c8dbf4749 100644 --- a/protocol/communities/community.go +++ b/protocol/communities/community.go @@ -94,6 +94,8 @@ func (o *Community) MarshalPublicAPIJSON() ([]byte, error) { Categories map[string]CommunityCategory `json:"categories"` Name string `json:"name"` Description string `json:"description"` + IntroMessage string `json:"introMessage"` + OutroMessage string `json:"outroMessage"` Images map[string]images.IdentityImage `json:"images"` Color string `json:"color"` MembersCount int `json:"membersCount"` @@ -136,6 +138,9 @@ func (o *Community) MarshalPublicAPIJSON() ([]byte, error) { } communityItem.MembersCount = len(o.config.CommunityDescription.Members) communityItem.Link = fmt.Sprintf("https://join.status.im/c/0x%x", o.ID()) + communityItem.IntroMessage = o.config.CommunityDescription.IntroMessage + communityItem.OutroMessage = o.config.CommunityDescription.OutroMessage + if o.config.CommunityDescription.Identity != nil { communityItem.Name = o.Name() communityItem.Color = o.config.CommunityDescription.Identity.Color @@ -172,6 +177,8 @@ func (o *Community) MarshalJSON() ([]byte, error) { RequestedAccessAt int `json:"requestedAccessAt"` Name string `json:"name"` Description string `json:"description"` + IntroMessage string `json:"introMessage"` + OutroMessage string `json:"outroMessage"` Chats map[string]CommunityChat `json:"chats"` Categories map[string]CommunityCategory `json:"categories"` Images map[string]images.IdentityImage `json:"images"` @@ -229,6 +236,9 @@ func (o *Community) MarshalJSON() ([]byte, error) { } communityItem.Members = o.config.CommunityDescription.Members communityItem.Permissions = o.config.CommunityDescription.Permissions + communityItem.IntroMessage = o.config.CommunityDescription.IntroMessage + communityItem.OutroMessage = o.config.CommunityDescription.OutroMessage + if o.config.CommunityDescription.Identity != nil { communityItem.Name = o.Name() communityItem.Color = o.config.CommunityDescription.Identity.Color @@ -273,6 +283,24 @@ func (o *Community) DescriptionText() string { return "" } +func (o *Community) IntroMessage() string { + if o != nil && + o.config != nil && + o.config.CommunityDescription != nil { + return o.config.CommunityDescription.IntroMessage + } + return "" +} + +func (o *Community) OutroMessage() string { + if o != nil && + o.config != nil && + o.config.CommunityDescription != nil { + return o.config.CommunityDescription.OutroMessage + } + return "" +} + func (o *Community) MembersCount() int { if o != nil && o.config != nil && @@ -684,6 +712,8 @@ func (o *Community) Edit(description *protobuf.CommunityDescription) { o.config.CommunityDescription.Identity.Color = description.Identity.Color o.config.CommunityDescription.Identity.Emoji = description.Identity.Emoji o.config.CommunityDescription.Identity.Images = description.Identity.Images + o.config.CommunityDescription.IntroMessage = description.IntroMessage + o.config.CommunityDescription.OutroMessage = description.OutroMessage if o.config.CommunityDescription.AdminSettings == nil { o.config.CommunityDescription.AdminSettings = &protobuf.CommunityAdminSettings{} } diff --git a/protocol/protobuf/communities.pb.go b/protocol/protobuf/communities.pb.go index 3f47782ed..c696fbc1e 100644 --- a/protocol/protobuf/communities.pb.go +++ b/protocol/protobuf/communities.pb.go @@ -247,6 +247,8 @@ type CommunityDescription struct { Categories map[string]*CommunityCategory `protobuf:"bytes,8,rep,name=categories,proto3" json:"categories,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` ArchiveMagnetlinkClock uint64 `protobuf:"varint,9,opt,name=archive_magnetlink_clock,json=archiveMagnetlinkClock,proto3" json:"archive_magnetlink_clock,omitempty"` AdminSettings *CommunityAdminSettings `protobuf:"bytes,10,opt,name=admin_settings,json=adminSettings,proto3" json:"admin_settings,omitempty"` + IntroMessage string `protobuf:"bytes,11,opt,name=intro_message,json=introMessage,proto3" json:"intro_message,omitempty"` + OutroMessage string `protobuf:"bytes,12,opt,name=outro_message,json=outroMessage,proto3" json:"outro_message,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -340,6 +342,20 @@ func (m *CommunityDescription) GetAdminSettings() *CommunityAdminSettings { return nil } +func (m *CommunityDescription) GetIntroMessage() string { + if m != nil { + return m.IntroMessage + } + return "" +} + +func (m *CommunityDescription) GetOutroMessage() string { + if m != nil { + return m.OutroMessage + } + return "" +} + type CommunityAdminSettings struct { PinMessageAllMembersEnabled bool `protobuf:"varint,1,opt,name=pin_message_all_members_enabled,json=pinMessageAllMembersEnabled,proto3" json:"pin_message_all_members_enabled,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1079,84 +1095,86 @@ func init() { } var fileDescriptor_f937943d74c1cd8b = []byte{ - // 1261 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0x1b, 0x37, - 0x13, 0xce, 0xea, 0xcb, 0xd2, 0xc8, 0x76, 0x64, 0x26, 0x71, 0x36, 0xce, 0x9b, 0x58, 0x59, 0xbc, - 0x05, 0x14, 0x14, 0x55, 0x10, 0x07, 0x05, 0x82, 0x7e, 0x24, 0x51, 0x1c, 0x21, 0x55, 0x63, 0x4b, - 0x09, 0x65, 0x37, 0x6d, 0x0e, 0x5d, 0x50, 0x5a, 0x5a, 0x26, 0xbc, 0xcb, 0x55, 0x97, 0x94, 0x51, - 0xf5, 0xd0, 0x5b, 0x81, 0xfe, 0x84, 0x02, 0x05, 0x7a, 0x29, 0xd0, 0x3f, 0xd2, 0x7b, 0xef, 0xbd, - 0xf5, 0xa7, 0x14, 0x24, 0x77, 0x57, 0x2b, 0x5b, 0x72, 0x02, 0x04, 0x3d, 0x2d, 0x87, 0x9c, 0x79, - 0x38, 0xf3, 0xcc, 0x70, 0x66, 0x61, 0x63, 0x18, 0x06, 0xc1, 0x84, 0x33, 0xc9, 0xa8, 0x68, 0x8e, - 0xa3, 0x50, 0x86, 0xa8, 0xac, 0x3f, 0x83, 0xc9, 0xd1, 0xd6, 0x95, 0xe1, 0x31, 0x91, 0x2e, 0xf3, - 0x28, 0x97, 0x4c, 0x4e, 0xcd, 0xb1, 0x73, 0x0a, 0xc5, 0xe7, 0x11, 0xe1, 0x12, 0xdd, 0x81, 0xd5, - 0xc4, 0x78, 0xea, 0x32, 0xcf, 0xb6, 0xea, 0x56, 0x63, 0x15, 0x57, 0xd3, 0xbd, 0x8e, 0x87, 0x6e, - 0x42, 0x25, 0xa0, 0xc1, 0x80, 0x46, 0xea, 0x3c, 0xa7, 0xcf, 0xcb, 0x66, 0xa3, 0xe3, 0xa1, 0xeb, - 0xb0, 0x12, 0xe3, 0xdb, 0xf9, 0xba, 0xd5, 0xa8, 0xe0, 0x92, 0x12, 0x3b, 0x1e, 0xba, 0x0a, 0xc5, - 0xa1, 0x1f, 0x0e, 0x4f, 0xec, 0x42, 0xdd, 0x6a, 0x14, 0xb0, 0x11, 0x9c, 0x9f, 0x2d, 0xb8, 0xbc, - 0x9b, 0x60, 0xef, 0x6b, 0x10, 0xf4, 0x31, 0x14, 0xa3, 0xd0, 0xa7, 0xc2, 0xb6, 0xea, 0xf9, 0xc6, - 0xfa, 0xce, 0x76, 0x33, 0x71, 0xbd, 0x79, 0x46, 0xb3, 0x89, 0x95, 0x1a, 0x36, 0xda, 0xce, 0x23, - 0x28, 0x6a, 0x19, 0xd5, 0x60, 0xf5, 0xb0, 0xfb, 0xa2, 0xdb, 0x7b, 0xdd, 0x75, 0x71, 0x6f, 0xaf, - 0x5d, 0xbb, 0x84, 0x56, 0xa1, 0xac, 0x56, 0x6e, 0x6b, 0x6f, 0xaf, 0x66, 0xa1, 0x6b, 0xb0, 0xa1, - 0xa5, 0xfd, 0x56, 0xb7, 0xf5, 0xbc, 0xed, 0x1e, 0xf6, 0xdb, 0xb8, 0x5f, 0xcb, 0x39, 0xff, 0x58, - 0x70, 0x35, 0xbd, 0xe0, 0x25, 0x8d, 0x02, 0x26, 0x04, 0x0b, 0xb9, 0x40, 0x37, 0xa0, 0x4c, 0xb9, - 0x70, 0x43, 0xee, 0x4f, 0x35, 0x1d, 0x65, 0xbc, 0x42, 0xb9, 0xe8, 0x71, 0x7f, 0x8a, 0x6c, 0x58, - 0x19, 0x47, 0xec, 0x94, 0x48, 0xaa, 0x89, 0x28, 0xe3, 0x44, 0x44, 0x9f, 0x43, 0x89, 0x0c, 0x87, - 0x54, 0x08, 0x4d, 0xc3, 0xfa, 0xce, 0x07, 0x0b, 0xa2, 0xc8, 0x5c, 0xd2, 0x6c, 0x69, 0x65, 0x1c, - 0x1b, 0x39, 0x07, 0x50, 0x32, 0x3b, 0x08, 0xc1, 0x7a, 0x12, 0x4d, 0x6b, 0x77, 0xb7, 0xdd, 0xef, - 0xd7, 0x2e, 0xa1, 0x0d, 0x58, 0xeb, 0xf6, 0xdc, 0xfd, 0xf6, 0xfe, 0xd3, 0x36, 0xee, 0x7f, 0xd1, - 0x79, 0x59, 0xb3, 0xd0, 0x15, 0xb8, 0xdc, 0xe9, 0x7e, 0xd5, 0x39, 0x68, 0x1d, 0x74, 0x7a, 0x5d, - 0xb7, 0xd7, 0xdd, 0xfb, 0xa6, 0x96, 0x43, 0xeb, 0x00, 0xbd, 0xae, 0x8b, 0xdb, 0xaf, 0x0e, 0xdb, - 0xfd, 0x83, 0x5a, 0xde, 0xf9, 0xad, 0x94, 0x09, 0xf1, 0x19, 0x15, 0xc3, 0x88, 0x8d, 0x25, 0x0b, - 0xf9, 0x2c, 0x39, 0x56, 0x26, 0x39, 0xa8, 0x0d, 0x2b, 0x26, 0xaf, 0xc2, 0xce, 0xd5, 0xf3, 0x8d, - 0xea, 0xce, 0x87, 0x0b, 0x82, 0xc8, 0xc0, 0x34, 0x4d, 0x5a, 0x44, 0x9b, 0xcb, 0x68, 0x8a, 0x13, - 0x5b, 0xf4, 0x04, 0xaa, 0xe3, 0x59, 0xa4, 0x9a, 0x8f, 0xea, 0xce, 0xed, 0x8b, 0xf9, 0xc0, 0x59, - 0x13, 0xb4, 0x03, 0xe5, 0xa4, 0x5e, 0xed, 0xa2, 0x36, 0xdf, 0xcc, 0x98, 0xeb, 0xfa, 0x32, 0xa7, - 0x38, 0xd5, 0x43, 0x8f, 0xa1, 0xa8, 0x2a, 0x4f, 0xd8, 0x25, 0xed, 0xfa, 0xdd, 0xb7, 0xb8, 0xae, - 0x50, 0x62, 0xc7, 0x8d, 0x9d, 0x4a, 0xfb, 0x80, 0x70, 0xd7, 0x67, 0x42, 0xda, 0x2b, 0xf5, 0x7c, - 0xa3, 0x82, 0x57, 0x06, 0x84, 0xef, 0x31, 0x21, 0x51, 0x17, 0x60, 0x48, 0x24, 0x1d, 0x85, 0x11, - 0xa3, 0xc2, 0x2e, 0xeb, 0x0b, 0x9a, 0x6f, 0xbb, 0x20, 0x35, 0x30, 0xb7, 0x64, 0x10, 0xd0, 0x43, - 0xb0, 0x49, 0x34, 0x3c, 0x66, 0xa7, 0xd4, 0x0d, 0xc8, 0x88, 0x53, 0xe9, 0x33, 0x7e, 0xe2, 0x9a, - 0x8c, 0x54, 0x74, 0x46, 0x36, 0xe3, 0xf3, 0xfd, 0xf4, 0x78, 0x57, 0xa7, 0xe8, 0x39, 0xac, 0x13, - 0x2f, 0x60, 0xdc, 0x15, 0x54, 0x4a, 0xc6, 0x47, 0xc2, 0x06, 0xcd, 0x4f, 0x7d, 0x81, 0x37, 0x2d, - 0xa5, 0xd8, 0x8f, 0xf5, 0xf0, 0x1a, 0xc9, 0x8a, 0x5b, 0x87, 0xb0, 0x9a, 0xcd, 0x1e, 0xaa, 0x41, - 0xfe, 0x84, 0x9a, 0x7a, 0xaf, 0x60, 0xb5, 0x44, 0xf7, 0xa0, 0x78, 0x4a, 0xfc, 0x89, 0xa9, 0xf4, - 0xea, 0xce, 0x8d, 0xa5, 0xcf, 0x12, 0x1b, 0xbd, 0x4f, 0x72, 0x0f, 0xad, 0xad, 0x57, 0x00, 0x33, - 0x66, 0x17, 0x80, 0x7e, 0x34, 0x0f, 0x7a, 0x7d, 0x01, 0xa8, 0xb2, 0xcf, 0x42, 0xbe, 0x81, 0xcb, - 0x67, 0xb8, 0x5c, 0x80, 0x7b, 0x7f, 0x1e, 0xf7, 0xe6, 0x22, 0x5c, 0x03, 0x32, 0xcd, 0x60, 0x3b, - 0xdf, 0xc2, 0xe6, 0x62, 0xba, 0xd0, 0x33, 0xd8, 0x1e, 0x33, 0xee, 0x06, 0x54, 0x08, 0x32, 0xa2, - 0x2e, 0xf1, 0x7d, 0x37, 0xae, 0x6f, 0x97, 0x72, 0x32, 0xf0, 0xa9, 0x17, 0xf7, 0x86, 0x9b, 0x63, - 0xc6, 0xf7, 0x8d, 0x56, 0xcb, 0xf7, 0x53, 0x4e, 0xb5, 0x8a, 0xf3, 0x77, 0x0e, 0xd6, 0xe6, 0x02, - 0x43, 0x8f, 0x66, 0x6f, 0xcc, 0xd2, 0x75, 0xf4, 0xff, 0x25, 0x14, 0xbc, 0xdb, 0xe3, 0xca, 0xbd, - 0xdf, 0xe3, 0xca, 0xbf, 0xe3, 0xe3, 0xda, 0x86, 0x6a, 0x5c, 0xbe, 0x7a, 0x48, 0x14, 0x34, 0xf1, - 0x49, 0x45, 0xab, 0x19, 0xb1, 0x05, 0xe5, 0x71, 0x28, 0x98, 0xaa, 0x7c, 0xfd, 0x62, 0x8b, 0x38, - 0x95, 0xff, 0xa3, 0x52, 0x73, 0x3c, 0xd8, 0x38, 0x97, 0xdb, 0xb3, 0x8e, 0x5a, 0xe7, 0x1c, 0x45, - 0x50, 0xe0, 0x24, 0x30, 0x37, 0x55, 0xb0, 0x5e, 0xcf, 0x39, 0x9f, 0x9f, 0x77, 0xde, 0xf9, 0xc5, - 0x82, 0x2b, 0xe9, 0x35, 0x1d, 0x7e, 0xca, 0x24, 0xd1, 0x1d, 0xf4, 0x01, 0x5c, 0x9b, 0xcd, 0x4d, - 0x6f, 0xf6, 0xee, 0xe3, 0x01, 0x7a, 0x75, 0xb8, 0xa4, 0xed, 0x8e, 0xd4, 0xd4, 0x8d, 0xa7, 0xa8, - 0x11, 0x96, 0x8f, 0xd0, 0x5b, 0x00, 0xe3, 0xc9, 0xc0, 0x67, 0x43, 0x57, 0xf1, 0x55, 0xd0, 0x36, - 0x15, 0xb3, 0xf3, 0x82, 0x4e, 0x9d, 0x9f, 0xac, 0x4c, 0xf5, 0x62, 0xfa, 0xdd, 0x84, 0x0a, 0x79, - 0x10, 0x7e, 0x19, 0xb2, 0x65, 0xfd, 0x3d, 0x1e, 0x6c, 0x99, 0xf8, 0xd5, 0x60, 0xeb, 0x2a, 0x0a, - 0x96, 0xfa, 0x70, 0xf6, 0xff, 0xa0, 0x70, 0xee, 0xff, 0xc0, 0xf9, 0xc3, 0x82, 0xdb, 0x8b, 0xfd, - 0xc0, 0x54, 0x8c, 0x43, 0x2e, 0xe8, 0x12, 0x7f, 0x3e, 0x83, 0x4a, 0x8a, 0x73, 0x41, 0x25, 0x67, - 0x18, 0xc4, 0x33, 0x03, 0x95, 0x35, 0x35, 0x3c, 0xc7, 0x92, 0x1a, 0x9f, 0xcb, 0x38, 0x95, 0x67, - 0x44, 0x17, 0x32, 0x44, 0x3b, 0x5f, 0xc3, 0x9d, 0x4c, 0x3d, 0x99, 0x27, 0x7b, 0xb6, 0xcd, 0x2e, - 0x71, 0xf5, 0x16, 0x80, 0xe9, 0xd4, 0xee, 0x24, 0x62, 0x31, 0x79, 0x15, 0xb3, 0x73, 0x18, 0x31, - 0xe7, 0x57, 0x0b, 0xaa, 0xaf, 0xc9, 0xc9, 0x24, 0x46, 0x55, 0x25, 0x2e, 0xd8, 0x28, 0xae, 0x05, - 0xb5, 0x44, 0xff, 0x83, 0x8a, 0x64, 0x01, 0x15, 0x92, 0x04, 0x63, 0x6d, 0x5f, 0xc0, 0xb3, 0x0d, - 0x75, 0xa9, 0x0c, 0xc7, 0x6c, 0xa8, 0x03, 0x59, 0xc5, 0x46, 0xd0, 0x7f, 0x1b, 0x64, 0xea, 0x87, - 0x24, 0xa1, 0x3d, 0x11, 0xcd, 0x89, 0xe7, 0x31, 0x3e, 0xd2, 0xaf, 0x4d, 0x9f, 0x68, 0x51, 0xd5, - 0xf7, 0x31, 0x11, 0xc7, 0x76, 0x49, 0x6f, 0xeb, 0xb5, 0xf3, 0x23, 0x6c, 0x65, 0x9c, 0x4b, 0x42, - 0xa6, 0x92, 0x78, 0x44, 0x12, 0x85, 0x75, 0x4a, 0x23, 0x91, 0xd4, 0xee, 0x1a, 0x4e, 0x44, 0x85, - 0x75, 0x14, 0x85, 0x41, 0xec, 0xae, 0x5e, 0xa3, 0x75, 0xc8, 0xc9, 0x50, 0xbb, 0x59, 0xc0, 0x39, - 0x19, 0x22, 0x47, 0xd5, 0x07, 0x97, 0x94, 0xcb, 0x03, 0x1d, 0x40, 0xa1, 0x9e, 0x6f, 0xac, 0xe2, - 0xb9, 0x3d, 0xe7, 0x77, 0x0b, 0xd0, 0x79, 0x07, 0x2e, 0xb8, 0xf8, 0x09, 0x94, 0x83, 0xd8, 0xbd, - 0xb8, 0x2e, 0x32, 0x5d, 0x72, 0x79, 0x28, 0x38, 0xb5, 0x42, 0xf7, 0x15, 0x82, 0xd6, 0x51, 0x3f, - 0x20, 0xaa, 0xcf, 0x5e, 0x5b, 0x88, 0x80, 0x53, 0x35, 0xe7, 0x4f, 0x0b, 0xb6, 0xcf, 0x63, 0x77, - 0xb8, 0x47, 0xbf, 0x7f, 0x07, 0xae, 0xde, 0xdf, 0xe5, 0x4d, 0x28, 0x85, 0x47, 0x47, 0x82, 0xca, - 0x98, 0xdd, 0x58, 0x52, 0x59, 0x10, 0xec, 0x07, 0x1a, 0xff, 0x47, 0xeb, 0xf5, 0xd9, 0xfc, 0x17, - 0xd2, 0xfc, 0x3b, 0x7f, 0x59, 0x70, 0x7d, 0x49, 0x14, 0xe8, 0x05, 0x94, 0xe3, 0xdf, 0x8a, 0x64, - 0xf8, 0xdc, 0xbb, 0xc8, 0x47, 0x6d, 0xd4, 0x8c, 0x85, 0x78, 0x0e, 0xa5, 0x00, 0x5b, 0x47, 0xb0, - 0x36, 0x77, 0xb4, 0xa0, 0xad, 0x3f, 0x9e, 0x6f, 0xeb, 0x77, 0xdf, 0x7a, 0x59, 0xca, 0xca, 0xac, - 0xcd, 0x3f, 0x5d, 0x7b, 0x53, 0x6d, 0xde, 0xfb, 0x34, 0xb1, 0x1c, 0x94, 0xf4, 0xea, 0xc1, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xa5, 0xbf, 0xbe, 0xf3, 0x0c, 0x00, 0x00, + // 1288 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0x0e, 0xf5, 0x67, 0x69, 0x24, 0x39, 0xf2, 0x26, 0x71, 0x18, 0xa7, 0x89, 0x15, 0xb6, 0x05, + 0x14, 0x14, 0x55, 0x10, 0x07, 0x05, 0x82, 0xfe, 0x24, 0x51, 0x1c, 0x21, 0x55, 0x63, 0x4b, 0xc9, + 0xca, 0x6e, 0xda, 0x1c, 0x4a, 0x50, 0xe2, 0x5a, 0x5e, 0x98, 0x5c, 0xaa, 0xdc, 0x95, 0x51, 0xf5, + 0xd0, 0x5b, 0x81, 0x3e, 0x42, 0x81, 0x1e, 0x0b, 0xf4, 0x45, 0x7a, 0xef, 0xbd, 0xb7, 0x1e, 0xfb, + 0x18, 0xc5, 0xee, 0x92, 0x14, 0x25, 0x4b, 0x8e, 0x81, 0xa0, 0x27, 0xee, 0xcc, 0xce, 0xcc, 0xce, + 0x7c, 0xf3, 0x47, 0xd8, 0x18, 0x06, 0xbe, 0x3f, 0x61, 0x54, 0x50, 0xc2, 0x9b, 0xe3, 0x30, 0x10, + 0x01, 0x2a, 0xaa, 0xcf, 0x60, 0x72, 0xb4, 0x75, 0x65, 0x78, 0xec, 0x08, 0x9b, 0xba, 0x84, 0x09, + 0x2a, 0xa6, 0xfa, 0xda, 0x3a, 0x85, 0xfc, 0xf3, 0xd0, 0x61, 0x02, 0xdd, 0x81, 0x4a, 0xac, 0x3c, + 0xb5, 0xa9, 0x6b, 0x1a, 0x75, 0xa3, 0x51, 0xc1, 0xe5, 0x84, 0xd7, 0x71, 0xd1, 0x4d, 0x28, 0xf9, + 0xc4, 0x1f, 0x90, 0x50, 0xde, 0x67, 0xd4, 0x7d, 0x51, 0x33, 0x3a, 0x2e, 0xba, 0x0e, 0x6b, 0x91, + 0x7d, 0x33, 0x5b, 0x37, 0x1a, 0x25, 0x5c, 0x90, 0x64, 0xc7, 0x45, 0x57, 0x21, 0x3f, 0xf4, 0x82, + 0xe1, 0x89, 0x99, 0xab, 0x1b, 0x8d, 0x1c, 0xd6, 0x84, 0xf5, 0x8b, 0x01, 0x97, 0x77, 0x63, 0xdb, + 0xfb, 0xca, 0x08, 0xfa, 0x04, 0xf2, 0x61, 0xe0, 0x11, 0x6e, 0x1a, 0xf5, 0x6c, 0x63, 0x7d, 0x67, + 0xbb, 0x19, 0xbb, 0xde, 0x5c, 0x90, 0x6c, 0x62, 0x29, 0x86, 0xb5, 0xb4, 0xf5, 0x08, 0xf2, 0x8a, + 0x46, 0x35, 0xa8, 0x1c, 0x76, 0x5f, 0x74, 0x7b, 0xaf, 0xbb, 0x36, 0xee, 0xed, 0xb5, 0x6b, 0x97, + 0x50, 0x05, 0x8a, 0xf2, 0x64, 0xb7, 0xf6, 0xf6, 0x6a, 0x06, 0xba, 0x06, 0x1b, 0x8a, 0xda, 0x6f, + 0x75, 0x5b, 0xcf, 0xdb, 0xf6, 0x61, 0xbf, 0x8d, 0xfb, 0xb5, 0x8c, 0xf5, 0x8f, 0x01, 0x57, 0x93, + 0x07, 0x5e, 0x92, 0xd0, 0xa7, 0x9c, 0xd3, 0x80, 0x71, 0x74, 0x03, 0x8a, 0x84, 0x71, 0x3b, 0x60, + 0xde, 0x54, 0xc1, 0x51, 0xc4, 0x6b, 0x84, 0xf1, 0x1e, 0xf3, 0xa6, 0xc8, 0x84, 0xb5, 0x71, 0x48, + 0x4f, 0x1d, 0x41, 0x14, 0x10, 0x45, 0x1c, 0x93, 0xe8, 0x0b, 0x28, 0x38, 0xc3, 0x21, 0xe1, 0x5c, + 0xc1, 0xb0, 0xbe, 0xf3, 0xe1, 0x92, 0x28, 0x52, 0x8f, 0x34, 0x5b, 0x4a, 0x18, 0x47, 0x4a, 0xd6, + 0x01, 0x14, 0x34, 0x07, 0x21, 0x58, 0x8f, 0xa3, 0x69, 0xed, 0xee, 0xb6, 0xfb, 0xfd, 0xda, 0x25, + 0xb4, 0x01, 0xd5, 0x6e, 0xcf, 0xde, 0x6f, 0xef, 0x3f, 0x6d, 0xe3, 0xfe, 0x97, 0x9d, 0x97, 0x35, + 0x03, 0x5d, 0x81, 0xcb, 0x9d, 0xee, 0xd7, 0x9d, 0x83, 0xd6, 0x41, 0xa7, 0xd7, 0xb5, 0x7b, 0xdd, + 0xbd, 0x6f, 0x6b, 0x19, 0xb4, 0x0e, 0xd0, 0xeb, 0xda, 0xb8, 0xfd, 0xea, 0xb0, 0xdd, 0x3f, 0xa8, + 0x65, 0xad, 0x7f, 0x0b, 0xa9, 0x10, 0x9f, 0x11, 0x3e, 0x0c, 0xe9, 0x58, 0xd0, 0x80, 0xcd, 0x92, + 0x63, 0xa4, 0x92, 0x83, 0xda, 0xb0, 0xa6, 0xf3, 0xca, 0xcd, 0x4c, 0x3d, 0xdb, 0x28, 0xef, 0x7c, + 0xb4, 0x24, 0x88, 0x94, 0x99, 0xa6, 0x4e, 0x0b, 0x6f, 0x33, 0x11, 0x4e, 0x71, 0xac, 0x8b, 0x9e, + 0x40, 0x79, 0x3c, 0x8b, 0x54, 0xe1, 0x51, 0xde, 0xb9, 0x7d, 0x3e, 0x1e, 0x38, 0xad, 0x82, 0x76, + 0xa0, 0x18, 0xd7, 0xab, 0x99, 0x57, 0xea, 0x9b, 0x29, 0x75, 0x55, 0x5f, 0xfa, 0x16, 0x27, 0x72, + 0xe8, 0x31, 0xe4, 0x65, 0xe5, 0x71, 0xb3, 0xa0, 0x5c, 0xbf, 0xfb, 0x16, 0xd7, 0xa5, 0x95, 0xc8, + 0x71, 0xad, 0x27, 0xd3, 0x3e, 0x70, 0x98, 0xed, 0x51, 0x2e, 0xcc, 0xb5, 0x7a, 0xb6, 0x51, 0xc2, + 0x6b, 0x03, 0x87, 0xed, 0x51, 0x2e, 0x50, 0x17, 0x60, 0xe8, 0x08, 0x32, 0x0a, 0x42, 0x4a, 0xb8, + 0x59, 0x54, 0x0f, 0x34, 0xdf, 0xf6, 0x40, 0xa2, 0xa0, 0x5f, 0x49, 0x59, 0x40, 0x0f, 0xc1, 0x74, + 0xc2, 0xe1, 0x31, 0x3d, 0x25, 0xb6, 0xef, 0x8c, 0x18, 0x11, 0x1e, 0x65, 0x27, 0xb6, 0xce, 0x48, + 0x49, 0x65, 0x64, 0x33, 0xba, 0xdf, 0x4f, 0xae, 0x77, 0x55, 0x8a, 0x9e, 0xc3, 0xba, 0xe3, 0xfa, + 0x94, 0xd9, 0x9c, 0x08, 0x41, 0xd9, 0x88, 0x9b, 0xa0, 0xf0, 0xa9, 0x2f, 0xf1, 0xa6, 0x25, 0x05, + 0xfb, 0x91, 0x1c, 0xae, 0x3a, 0x69, 0x12, 0xbd, 0x0f, 0x55, 0xca, 0x44, 0x18, 0xd8, 0x3e, 0xe1, + 0xdc, 0x19, 0x11, 0xb3, 0xac, 0xba, 0xb7, 0xa2, 0x98, 0xfb, 0x9a, 0x27, 0x85, 0x82, 0x49, 0x5a, + 0xa8, 0xa2, 0x85, 0x14, 0x33, 0x12, 0xda, 0x3a, 0x84, 0x4a, 0xba, 0x0e, 0x50, 0x0d, 0xb2, 0x27, + 0x44, 0x77, 0x4e, 0x09, 0xcb, 0x23, 0xba, 0x07, 0xf9, 0x53, 0xc7, 0x9b, 0xe8, 0x9e, 0x29, 0xef, + 0xdc, 0x58, 0xd9, 0xe0, 0x58, 0xcb, 0x7d, 0x9a, 0x79, 0x68, 0x6c, 0xbd, 0x02, 0x98, 0xe5, 0x68, + 0x89, 0xd1, 0x8f, 0xe7, 0x8d, 0x5e, 0x5f, 0x62, 0x54, 0xea, 0xa7, 0x4d, 0xbe, 0x81, 0xcb, 0x0b, + 0x59, 0x59, 0x62, 0xf7, 0xfe, 0xbc, 0xdd, 0x9b, 0xcb, 0xec, 0x6a, 0x23, 0xd3, 0x94, 0x6d, 0xeb, + 0x3b, 0xd8, 0x5c, 0x0e, 0x3c, 0x7a, 0x06, 0xdb, 0x63, 0xca, 0x62, 0x08, 0x6d, 0xc7, 0xf3, 0xec, + 0xa8, 0x53, 0x6c, 0xc2, 0x9c, 0x81, 0x47, 0xdc, 0x68, 0xca, 0xdc, 0x1c, 0x53, 0x16, 0x81, 0xda, + 0xf2, 0xbc, 0x04, 0x53, 0x25, 0x62, 0xfd, 0x9d, 0x81, 0xea, 0x5c, 0x60, 0xe8, 0xd1, 0xac, 0x5b, + 0x0d, 0x55, 0x91, 0x1f, 0xac, 0x80, 0xe0, 0x62, 0x6d, 0x9a, 0x79, 0xb7, 0x36, 0xcd, 0x5e, 0xb0, + 0x4d, 0xb7, 0xa1, 0x1c, 0x35, 0x82, 0x5a, 0x37, 0x39, 0x05, 0x7c, 0xdc, 0x1b, 0x72, 0xdb, 0x6c, + 0x41, 0x71, 0x1c, 0x70, 0x2a, 0x7b, 0x48, 0xf5, 0x7e, 0x1e, 0x27, 0xf4, 0xff, 0x54, 0x6a, 0x96, + 0x0b, 0x1b, 0x67, 0x72, 0xbb, 0xe8, 0xa8, 0x71, 0xc6, 0x51, 0x04, 0x39, 0xe6, 0xf8, 0xfa, 0xa5, + 0x12, 0x56, 0xe7, 0x39, 0xe7, 0xb3, 0xf3, 0xce, 0x5b, 0xbf, 0x1a, 0x70, 0x25, 0x79, 0xa6, 0xc3, + 0x4e, 0xa9, 0x70, 0xd4, 0x2c, 0x7e, 0x00, 0xd7, 0x66, 0x1b, 0xd8, 0x9d, 0x4d, 0x90, 0x68, 0x15, + 0x5f, 0x1d, 0xae, 0x18, 0xe0, 0x23, 0xb9, 0xbf, 0xa3, 0x7d, 0xac, 0x89, 0xd5, 0xcb, 0xf8, 0x16, + 0xc0, 0x78, 0x32, 0xf0, 0xe8, 0xd0, 0x96, 0x78, 0xe5, 0x94, 0x4e, 0x49, 0x73, 0x5e, 0x90, 0xa9, + 0xf5, 0xb3, 0x91, 0xaa, 0x5e, 0x4c, 0xbe, 0x9f, 0x10, 0x2e, 0x0e, 0x82, 0xaf, 0x02, 0xba, 0x6a, + 0x53, 0x44, 0x2b, 0x32, 0x15, 0xbf, 0x5c, 0x91, 0x5d, 0x09, 0xc1, 0x4a, 0x1f, 0x16, 0xff, 0x34, + 0x72, 0x67, 0xfe, 0x34, 0xac, 0x3f, 0x0c, 0xb8, 0xbd, 0xdc, 0x0f, 0x4c, 0xf8, 0x38, 0x60, 0x9c, + 0xac, 0xf0, 0xe7, 0x73, 0x28, 0x25, 0x76, 0xce, 0xa9, 0xe4, 0x14, 0x82, 0x78, 0xa6, 0x20, 0xb3, + 0x26, 0xd7, 0xf0, 0x58, 0x10, 0xed, 0x73, 0x11, 0x27, 0xf4, 0x0c, 0xe8, 0x5c, 0x0a, 0x68, 0xeb, + 0x1b, 0xb8, 0x93, 0xaa, 0x27, 0xdd, 0xb2, 0x8b, 0x03, 0x7b, 0x85, 0xab, 0xb7, 0x00, 0xf4, 0xcc, + 0xb7, 0x27, 0x21, 0x8d, 0xc0, 0x2b, 0x69, 0xce, 0x61, 0x48, 0xad, 0xdf, 0x0c, 0x28, 0xbf, 0x76, + 0x4e, 0x26, 0xf1, 0x08, 0xae, 0x41, 0x96, 0xd3, 0x51, 0x54, 0x0b, 0xf2, 0x88, 0xde, 0x83, 0x92, + 0xa0, 0x3e, 0xe1, 0xc2, 0xf1, 0xc7, 0x4a, 0x3f, 0x87, 0x67, 0x0c, 0xf9, 0xa8, 0x08, 0xc6, 0x74, + 0xa8, 0x02, 0xa9, 0x60, 0x4d, 0xa8, 0xff, 0x16, 0x67, 0xea, 0x05, 0x4e, 0x0c, 0x7b, 0x4c, 0xea, + 0x1b, 0xd7, 0xa5, 0x6c, 0xa4, 0xba, 0x4d, 0xdd, 0x28, 0x52, 0xd6, 0xf7, 0xb1, 0xc3, 0x8f, 0xcd, + 0x82, 0x62, 0xab, 0xb3, 0xf5, 0x13, 0x6c, 0xa5, 0x9c, 0x8b, 0x43, 0x26, 0xc2, 0x71, 0x1d, 0xe1, + 0x48, 0x5b, 0xa7, 0x24, 0xe4, 0x71, 0xed, 0x56, 0x71, 0x4c, 0x4a, 0x5b, 0x47, 0x61, 0xe0, 0x47, + 0xee, 0xaa, 0x33, 0x5a, 0x87, 0x8c, 0x08, 0x94, 0x9b, 0x39, 0x9c, 0x11, 0x01, 0xb2, 0x64, 0x7d, + 0x30, 0x41, 0x98, 0x38, 0x50, 0x01, 0xe4, 0xea, 0xd9, 0x46, 0x05, 0xcf, 0xf1, 0xac, 0xdf, 0x0d, + 0x40, 0x67, 0x1d, 0x38, 0xe7, 0xe1, 0x27, 0x50, 0xf4, 0x23, 0xf7, 0xa2, 0xba, 0x48, 0x4d, 0xc9, + 0xd5, 0xa1, 0xe0, 0x44, 0x0b, 0xdd, 0x97, 0x16, 0x94, 0x8c, 0xfc, 0x95, 0x91, 0x73, 0xf6, 0xda, + 0x52, 0x0b, 0x38, 0x11, 0xb3, 0xfe, 0x34, 0x60, 0xfb, 0xac, 0xed, 0x0e, 0x73, 0xc9, 0x0f, 0x17, + 0xc0, 0xea, 0xdd, 0x5d, 0xde, 0x84, 0x42, 0x70, 0x74, 0xc4, 0x89, 0x88, 0xd0, 0x8d, 0x28, 0x99, + 0x05, 0x4e, 0x7f, 0x24, 0xd1, 0x1f, 0xb9, 0x3a, 0x2f, 0xe6, 0x3f, 0x97, 0xe4, 0xdf, 0xfa, 0xcb, + 0x80, 0xeb, 0x2b, 0xa2, 0x40, 0x2f, 0xa0, 0x18, 0xfd, 0xa0, 0xc4, 0xcb, 0xe7, 0xde, 0x79, 0x3e, + 0x2a, 0xa5, 0x66, 0x44, 0x44, 0x7b, 0x28, 0x31, 0xb0, 0x75, 0x04, 0xd5, 0xb9, 0xab, 0x25, 0x63, + 0xfd, 0xf1, 0xfc, 0x58, 0xbf, 0xfb, 0xd6, 0xc7, 0x12, 0x54, 0x66, 0x63, 0xfe, 0x69, 0xf5, 0x4d, + 0xb9, 0x79, 0xef, 0xb3, 0x58, 0x73, 0x50, 0x50, 0xa7, 0x07, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, + 0x6b, 0x01, 0x17, 0xd0, 0x3d, 0x0d, 0x00, 0x00, } diff --git a/protocol/protobuf/communities.proto b/protocol/protobuf/communities.proto index 1081e4c18..cc5b0aa4f 100644 --- a/protocol/protobuf/communities.proto +++ b/protocol/protobuf/communities.proto @@ -45,6 +45,8 @@ message CommunityDescription { map categories = 8; uint64 archive_magnetlink_clock = 9; CommunityAdminSettings admin_settings = 10; + string intro_message = 11; + string outro_message = 12; } message CommunityAdminSettings { diff --git a/protocol/requests/create_community_request.go b/protocol/requests/create_community_request.go index 4c245071c..0b162be32 100644 --- a/protocol/requests/create_community_request.go +++ b/protocol/requests/create_community_request.go @@ -10,15 +10,26 @@ import ( ) var ( - ErrCreateCommunityInvalidName = errors.New("create-community: invalid name") - ErrCreateCommunityInvalidColor = errors.New("create-community: invalid color") - ErrCreateCommunityInvalidDescription = errors.New("create-community: invalid description") - ErrCreateCommunityInvalidMembership = errors.New("create-community: invalid membership") + ErrCreateCommunityInvalidName = errors.New("create-community: invalid name") + ErrCreateCommunityInvalidColor = errors.New("create-community: invalid color") + ErrCreateCommunityInvalidDescription = errors.New("create-community: invalid description") + ErrCreateCommunityInvalidIntroMessage = errors.New("create-community: invalid intro message") + ErrCreateCommunityInvalidOutroMessage = errors.New("create-community: invalid outro message") + ErrCreateCommunityInvalidMembership = errors.New("create-community: invalid membership") +) + +const ( + maxNameLength = 30 + maxDescriptionLength = 140 + maxIntroMessageLength = 1400 + maxOutroMessageLength = 80 ) type CreateCommunity struct { Name string `json:"name"` Description string `json:"description"` + IntroMessage string `json:"introMessage,omitempty"` + OutroMessage string `json:"outroMessage,omitempty"` Color string `json:"color"` Emoji string `json:"emoji"` Membership protobuf.CommunityPermissions_Access `json:"membership"` @@ -42,14 +53,22 @@ func adaptIdentityImageToProtobuf(img *userimages.IdentityImage) *protobuf.Ident } func (c *CreateCommunity) Validate() error { - if c.Name == "" { + if c.Name == "" || len(c.Name) > maxNameLength { return ErrCreateCommunityInvalidName } - if c.Description == "" { + if c.Description == "" || len(c.Description) > maxDescriptionLength { return ErrCreateCommunityInvalidDescription } + if len(c.IntroMessage) > maxIntroMessageLength { + return ErrCreateCommunityInvalidIntroMessage + } + + if len(c.OutroMessage) > maxOutroMessageLength { + return ErrCreateCommunityInvalidOutroMessage + } + if c.Membership == protobuf.CommunityPermissions_UNKNOWN_ACCESS { return ErrCreateCommunityInvalidMembership } @@ -102,6 +121,8 @@ func (c *CreateCommunity) ToCommunityDescription() (*protobuf.CommunityDescripti AdminSettings: &protobuf.CommunityAdminSettings{ PinMessageAllMembersEnabled: c.PinMessageAllMembersEnabled, }, + IntroMessage: c.IntroMessage, + OutroMessage: c.OutroMessage, } return description, nil } diff --git a/protocol/requests/edit_community.go b/protocol/requests/edit_community.go index 3f5ae0525..205341042 100644 --- a/protocol/requests/edit_community.go +++ b/protocol/requests/edit_community.go @@ -4,16 +4,10 @@ import ( "errors" "github.com/status-im/status-go/eth-node/types" - - "github.com/status-im/status-go/protocol/protobuf" ) var ( - ErrEditCommunityInvalidID = errors.New("edit-community: invalid id") - ErrEditCommunityInvalidName = errors.New("edit-community: invalid name") - ErrEditCommunityInvalidColor = errors.New("edit-community: invalid color") - ErrEditCommunityInvalidDescription = errors.New("edit-community: invalid description") - ErrEditCommunityInvalidMembership = errors.New("edit-community: invalid membership") + ErrEditCommunityInvalidID = errors.New("edit-community: invalid id") ) type EditCommunity struct { @@ -22,26 +16,9 @@ type EditCommunity struct { } func (u *EditCommunity) Validate() error { - if len(u.CommunityID) == 0 { return ErrEditCommunityInvalidID } - if u.Name == "" { - return ErrEditCommunityInvalidName - } - - if u.Description == "" { - return ErrEditCommunityInvalidDescription - } - - if u.Membership == protobuf.CommunityPermissions_UNKNOWN_ACCESS { - return ErrEditCommunityInvalidMembership - } - - if u.Color == "" { - return ErrEditCommunityInvalidColor - } - - return nil + return u.CreateCommunity.Validate() } diff --git a/services/chat/api.go b/services/chat/api.go index 5d48f8190..8e474d40e 100644 --- a/services/chat/api.go +++ b/services/chat/api.go @@ -87,6 +87,8 @@ type ChannelGroup struct { Admin bool `json:"admin"` Verified bool `json:"verified"` Description string `json:"description"` + IntroMessage string `json:"introMessage"` + OutroMessage string `json:"outroMessage"` Permissions *protobuf.CommunityPermissions `json:"permissions"` Members map[string]*protobuf.CommunityMember `json:"members"` CanManageUsers bool `json:"canManageUsers"` @@ -116,18 +118,20 @@ func (api *API) GetChats(ctx context.Context) (map[string]ChannelGroup, error) { result := make(map[string]ChannelGroup) result[pubKey] = ChannelGroup{ - Type: Personal, - Name: "", - Images: make(map[string]images.IdentityImage), - Color: "", - Chats: make(map[string]*Chat), - Categories: make(map[string]communities.CommunityCategory), - EnsName: "", // Not implemented yet in communities - Admin: true, - Verified: true, - Description: "", - Permissions: &protobuf.CommunityPermissions{}, - Muted: false, + Type: Personal, + Name: "", + Images: make(map[string]images.IdentityImage), + Color: "", + Chats: make(map[string]*Chat), + Categories: make(map[string]communities.CommunityCategory), + EnsName: "", // Not implemented yet in communities + Admin: true, + Verified: true, + Description: "", + IntroMessage: "", + OutroMessage: "", + Permissions: &protobuf.CommunityPermissions{}, + Muted: false, } for _, chat := range channels { @@ -153,6 +157,8 @@ func (api *API) GetChats(ctx context.Context) (map[string]ChannelGroup, error) { Admin: community.IsAdmin(), Verified: community.Verified(), Description: community.DescriptionText(), + IntroMessage: community.IntroMessage(), + OutroMessage: community.OutroMessage(), Permissions: community.Description().Permissions, Members: community.Description().Members, CanManageUsers: community.CanManageUsers(community.MemberIdentity()),