Skip to content

Commit

Permalink
feat: add textInput
Browse files Browse the repository at this point in the history
Signed-off-by: clegirar <clemntgirard@gmail.com>
  • Loading branch information
clegirar committed Apr 29, 2021
1 parent 6656e19 commit dbaf9f4
Show file tree
Hide file tree
Showing 18 changed files with 474 additions and 918 deletions.
15 changes: 1 addition & 14 deletions api/messengertypes.proto
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ service MessengerService {

// MessageSearch
rpc MessageSearch (MessageSearch.Request) returns (MessageSearch.Reply);

// SetGroupInfo
rpc SetMultiMemberInfo (SetMultiMemberInfo.Request) returns (SetMultiMemberInfo.Reply);
}

message PaginatedInteractionsOptions {
Expand Down Expand Up @@ -503,7 +500,7 @@ message Conversation {
string reply_options_cid = 14 [(gogoproto.moretags) = "gorm:\"column:reply_options_cid\"", (gogoproto.customname) = "ReplyOptionsCID"];
Interaction reply_options = 15 [(gogoproto.customname) = "ReplyOptions"];
repeated ConversationReplicationInfo replication_info = 16 [(gogoproto.moretags) = "gorm:\"foreignKey:ConversationPublicKey\""];
// info_date is used when SetGroupInfo was called
// info_date is used when SetGroupInfo is called
int64 info_date = 18;

enum Type {
Expand Down Expand Up @@ -850,13 +847,3 @@ message MessageSearch {
repeated Interaction results = 1;
}
}

message SetMultiMemberInfo {
message Request {
string display_name = 1;
string avatar_cid = 2 [(gogoproto.customname) = "AvatarCID"];
string conv_pk = 3 [(gogoproto.customname) = "ConvPK"];
string attachment_cids = 4 [(gogoproto.customname) = "AttachmentCIDs"];
}
message Reply {}
}
3 changes: 0 additions & 3 deletions api/messengertypes.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 0 additions & 23 deletions docs/apis/messengertypes.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 0 additions & 53 deletions docs/apis/messengertypes.swagger.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ go 1.15

require (
bazil.org/fuse v0.0.0-20200524192727-fb710f7dfd05 // indirect
berty.tech/berty/tool/tyber/go/v2 v2.0.0-20210420104727-50e50bcdaa65
berty.tech/go-ipfs-log v1.2.6
berty.tech/go-libp2p-tor-transport v0.8.4
berty.tech/go-orbit-db v1.10.11
Expand Down
11 changes: 0 additions & 11 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions go/pkg/bertymessenger/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -1480,10 +1480,3 @@ func (svc *service) MessageSearch(ctx context.Context, request *messengertypes.M

return &messengertypes.MessageSearch_Reply{Results: results}, nil
}

func (svc *service) SetMultiMemberInfo(ctx context.Context, request *messengertypes.SetMultiMemberInfo_Request) (*messengertypes.SetMultiMemberInfo_Reply, error) {
if err := svc.sendGroupInfo(request.GetConvPK(), request.GetDisplayName(), request.GetAvatarCID(), request.GetAttachmentCIDs()); err != nil {
svc.logger.Error("failed to set multimember group info", zap.Error(err))
}
return &messengertypes.SetMultiMemberInfo_Reply{}, nil
}
5 changes: 0 additions & 5 deletions go/pkg/bertymessenger/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,23 +251,18 @@ func (d *dbWrapper) updateConversation(c messengertypes.Conversation) (bool, err
if c.Link != "" {
columns = append(columns, "link")
}

if c.DisplayName != "" {
columns = append(columns, "display_name")
}

if c.LocalDevicePublicKey != "" {
columns = append(columns, "local_device_public_key")
}

if c.AccountMemberPublicKey != "" {
columns = append(columns, "account_member_public_key")
}

if c.AvatarCID != "" {
columns = append(columns, "avatar_cid")
}

if c.InfoDate != 0 {
columns = append(columns, "info_date")
}
Expand Down
32 changes: 0 additions & 32 deletions go/pkg/bertymessenger/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -488,38 +488,6 @@ func (svc *service) attachmentRetrieve(cid string) (*io.PipeReader, error) {
}, svc.logger), nil
}

func (svc *service) sendGroupInfo(groupPK string, displayName string, avatarCID string, attachmentCID string) error {
am, err := mt.AppMessage_TypeSetGroupInfo.MarshalPayload(
timestampMs(time.Now()),
"",
nil,
&mt.AppMessage_SetGroupInfo{DisplayName: displayName, AvatarCid: avatarCID},
)
if err != nil {
return errcode.ErrSerialization.Wrap(err)
}
pk, err := b64DecodeBytes(groupPK)
if err != nil {
return errcode.ErrDeserialization.Wrap(err)
}
if attachmentCID != "" {
attachmentCIDBytes, err := b64DecodeBytes(attachmentCID)
if err != nil {
return errcode.ErrDeserialization.Wrap(err)
}
_, err = svc.protocolClient.AppMetadataSend(svc.ctx, &protocoltypes.AppMetadataSend_Request{GroupPK: pk, Payload: am, AttachmentCIDs: [][]byte{attachmentCIDBytes}})
if err != nil {
return errcode.ErrProtocolSend.Wrap(err)
}
} else {
_, err = svc.protocolClient.AppMetadataSend(svc.ctx, &protocoltypes.AppMetadataSend_Request{GroupPK: pk, Payload: am})
if err != nil {
return errcode.ErrProtocolSend.Wrap(err)
}
}
return nil
}

func (svc *service) sendAccountUserInfo(groupPK string) error {
acc, err := svc.db.getAccount()
if err != nil {
Expand Down
53 changes: 0 additions & 53 deletions go/pkg/bertymessenger/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1822,56 +1822,3 @@ func TestReply(t *testing.T) {
require.Equal(t, "Test", castedValue.GetBody())
}
}

func TestSetMultiMemberInfo(t *testing.T) {
testutil.FilterStabilityAndSpeed(t, testutil.Stable, testutil.Slow)

logger, cleanup := testutil.Logger(t)
defer cleanup()
ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
node, cleanup := testingNode(ctx, t)
defer cleanup()
node.ProcessWholeStream(t)

logger.Error("starting test")

// create conversation
const conversationName = "Tasty"
var createdConversationPK string
{
reply, err := node.GetClient().ConversationCreate(ctx, &messengertypes.ConversationCreate_Request{DisplayName: conversationName})
require.NoError(t, err)
require.NotEmpty(t, reply.GetPublicKey())
createdConversationPK = reply.GetPublicKey()
}

time.Sleep(time.Second)

// check conversation, with display name
{
conversation := node.GetConversation(t, createdConversationPK)
require.NotNil(t, conversation)
require.Equal(t, messengertypes.Conversation_MultiMemberType, conversation.GetType())
require.Equal(t, createdConversationPK, conversation.GetPublicKey())
require.Equal(t, conversationName, conversation.GetDisplayName())
require.NotEmpty(t, conversation.GetLink())
}

// send SetGroupInfo to change DisplayName
const newConversationName = "Barbecue"
{
_, err := node.GetClient().SetMultiMemberInfo(ctx, &messengertypes.SetMultiMemberInfo_Request{
ConvPK: createdConversationPK,
DisplayName: newConversationName,
})
require.NoError(t, err)
}

time.Sleep(time.Second)

// check conversation, after SetMultiMemberInfo
{
conversation := node.GetConversation(t, createdConversationPK)
require.Equal(t, newConversationName, conversation.GetDisplayName())
}
}
Loading

0 comments on commit dbaf9f4

Please sign in to comment.