Merge pull request #3834 from n0izn0iz/group-info-metadata

fix(messenger): set group info on metadata log
berty · Dec 30, 2021 · c1034dd · c1034dd
2 parents 4d721d2 + 3af7b9e
commit c1034dd
Show file tree

Hide file tree

Showing 12 changed files with 215 additions and 183 deletions.
diff --git a/api/messengertypes.proto b/api/messengertypes.proto
@@ -708,6 +708,7 @@ message Interact {
     string conversation_public_key = 3;
     repeated string media_cids = 4;
     string target_cid = 5 [(gogoproto.customname) = "TargetCID"];
+    bool metadata = 6;
   }
   message Reply {
     string cid = 1 [(gogoproto.customname) = "CID"];

diff --git a/docs/apis/messengertypes.md b/docs/apis/messengertypes.md
diff --git a/docs/apis/messengertypes.swagger.json b/docs/apis/messengertypes.swagger.json
diff --git a/docs/gen.sum b/docs/gen.sum
diff --git a/go/gen.sum b/go/gen.sum
diff --git a/go/pkg/bertymessenger/api.go b/go/pkg/bertymessenger/api.go
@@ -989,12 +989,23 @@ func (svc *service) Interact(ctx context.Context, req *messengertypes.Interact_R
 		}
 	}
 
-	reply, err := svc.protocolClient.AppMessageSend(ctx, &protocoltypes.AppMessageSend_Request{GroupPK: gpkb, Payload: fp, AttachmentCIDs: cids})
-	if err != nil {
-		return nil, errcode.ErrProtocolSend.Wrap(err)
+	var cidBytes []byte
+
+	if req.GetMetadata() {
+		reply, err := svc.protocolClient.AppMetadataSend(ctx, &protocoltypes.AppMetadataSend_Request{GroupPK: gpkb, Payload: fp, AttachmentCIDs: cids})
+		if err != nil {
+			return nil, errcode.ErrProtocolSend.Wrap(err)
+		}
+		cidBytes = reply.GetCID()
+	} else {
+		reply, err := svc.protocolClient.AppMessageSend(ctx, &protocoltypes.AppMessageSend_Request{GroupPK: gpkb, Payload: fp, AttachmentCIDs: cids})
+		if err != nil {
+			return nil, errcode.ErrProtocolSend.Wrap(err)
+		}
+		cidBytes = reply.GetCID()
 	}
 
-	cid, err := ipfscid.Cast(reply.GetCID())
+	cid, err := ipfscid.Cast(cidBytes)
 	if err != nil {
 		return nil, errcode.ErrDeserialization.Wrap(err)
 	}

diff --git a/go/pkg/messengertypes/messengertypes.pb.go b/go/pkg/messengertypes/messengertypes.pb.go
diff --git a/js/gen.sum b/js/gen.sum
diff --git a/js/packages/api/root.pb.d.ts b/js/packages/api/root.pb.d.ts
diff --git a/js/packages/api/root.pb.js b/js/packages/api/root.pb.js
diff --git a/js/packages/components/chat/MultiMember.tsx b/js/packages/components/chat/MultiMember.tsx
@@ -62,6 +62,7 @@ export const MultiMember: ScreenFC<'Chat.Group'> = ({ route: { params }, navigat
 			conversationPublicKey: conv?.publicKey,
 			type: beapi.messenger.AppMessage.Type.TypeSetGroupInfo,
 			payload: buf,
+			metadata: true,
 		})
 		setIsEdit(false)
 	}

diff --git a/js/packages/components/chat/MultiMemberSettings.tsx b/js/packages/components/chat/MultiMemberSettings.tsx
@@ -60,6 +60,7 @@ const GroupChatSettingsHeader: React.FC<{ publicKey: Maybe<string> }> = ({ publi
 					type: beapi.messenger.AppMessage.Type.TypeSetGroupInfo,
 					payload: buf,
 					mediaCids: [reply.cid],
+					metadata: true,
 				})
 			}
 		} catch (err) {