Skip to content

Commit

Permalink
feat: support tag indices to community url data
Browse files Browse the repository at this point in the history
  • Loading branch information
MishkaRogachev committed Jul 3, 2023
1 parent ac1b1ff commit 419e857
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
13 changes: 9 additions & 4 deletions protocol/messenger_share_urls.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ import (
)

type CommunityURLData struct {
DisplayName string `json:"displayName"`
Description string `json:"description"`
MembersCount uint32 `json:"membersCount"`
Color string `json:"color"`
DisplayName string `json:"displayName"`
Description string `json:"description"`
MembersCount uint32 `json:"membersCount"`
Color string `json:"color"`
TagIndices []uint32 `json:"tagIndices"`
}

type CommunityChannelURLData struct {
Expand Down Expand Up @@ -93,6 +94,7 @@ func (m *Messenger) prepareCommunityData(community *communities.Community) Commu
Description: community.DescriptionText(),
MembersCount: uint32(community.MembersCount()),
Color: community.Identity().GetColor(),
TagIndices: community.TagsIndices(),
}
}

Expand Down Expand Up @@ -202,6 +204,7 @@ func (m *Messenger) parseCommunityURLWithData(data string, signature string) (*U
Description: communityProto.Description,
MembersCount: communityProto.MembersCount,
Color: communityProto.Color,
TagIndices: communityProto.TagIndices,
},
}, nil
}
Expand Down Expand Up @@ -278,6 +281,7 @@ func (m *Messenger) prepareEncodedCommunityChannelData(community *communities.Co
Description: community.DescriptionText(),
MembersCount: uint32(community.MembersCount()),
Color: community.Identity().GetColor(),
TagIndices: community.TagsIndices(),
}

channelProto := &protobuf.Channel{
Expand Down Expand Up @@ -352,6 +356,7 @@ func (m *Messenger) parseCommunityChannelURLWithData(data string, signature stri
Description: channelProto.Community.Description,
MembersCount: channelProto.Community.MembersCount,
Color: channelProto.Community.Color,
TagIndices: channelProto.Community.TagIndices,
},
Channel: CommunityChannelURLData{
Emoji: channelProto.Emoji,
Expand Down
4 changes: 4 additions & 0 deletions protocol/messenger_share_urls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ func (s *MessengerShareUrlsSuite) TestParseCommunityURLWithChatKey() {
s.Require().Equal(community.DescriptionText(), urlData.Community.Description)
s.Require().Equal(uint32(community.MembersCount()), urlData.Community.MembersCount)
s.Require().Equal(community.Identity().GetColor(), urlData.Community.Color)
s.Require().Equal(community.TagsIndices(), urlData.Community.TagIndices)
}

func (s *MessengerShareUrlsSuite) TestShareCommunityURLWithData() {
Expand Down Expand Up @@ -252,6 +253,7 @@ func (s *MessengerShareUrlsSuite) TestParseCommunityURLWithData() {
s.Require().Equal(community.DescriptionText(), urlData.Community.Description)
s.Require().Equal(uint32(community.MembersCount()), urlData.Community.MembersCount)
s.Require().Equal(community.Identity().GetColor(), urlData.Community.Color)
s.Require().Equal(community.TagsIndices(), urlData.Community.TagIndices)
}

func (s *MessengerShareUrlsSuite) TestShareCommunityChannelURLWithChatKey() {
Expand Down Expand Up @@ -289,6 +291,7 @@ func (s *MessengerShareUrlsSuite) TestParseCommunityChannelURLWithChatKey() {
s.Require().Equal(community.DescriptionText(), urlData.Community.Description)
s.Require().Equal(uint32(community.MembersCount()), urlData.Community.MembersCount)
s.Require().Equal(community.Identity().GetColor(), urlData.Community.Color)
s.Require().Equal(community.TagsIndices(), urlData.Community.TagIndices)

s.Require().NotNil(urlData.Channel)
s.Require().Equal(channel.Identity.Emoji, urlData.Channel.Emoji)
Expand Down Expand Up @@ -330,6 +333,7 @@ func (s *MessengerShareUrlsSuite) TestParseCommunityChannelURLWithData() {
s.Require().Equal(community.DescriptionText(), urlData.Community.Description)
s.Require().Equal(uint32(community.MembersCount()), urlData.Community.MembersCount)
s.Require().Equal(community.Identity().GetColor(), urlData.Community.Color)
s.Require().Equal(community.TagsIndices(), urlData.Community.TagIndices)

s.Require().NotNil(urlData.Channel)
s.Require().Equal(channel.Identity.Emoji, urlData.Channel.Emoji)
Expand Down

0 comments on commit 419e857

Please sign in to comment.