chat,user: pipe back FriendChatId in user, debug checks on StartChat

Author: mfycheng

go.mod

@@ -131,3 +131,5 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace github.com/code-payments/code-protobuf-api => github.com/mfycheng/code-protobuf-api v0.0.0-20240917192150-82a26e4a0108

go.sum

@@ -121,8 +121,6 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/code-payments/code-protobuf-api v1.19.0 h1:md/eJhqltz8dDY0U8hwT/42C3h+kP+W/68D7RMSjqPo=
-github.com/code-payments/code-protobuf-api v1.19.0/go.mod h1:pHQm75vydD6Cm2qHAzlimW6drysm489Z4tVxC2zHSsU=
 github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 h1:NmTXa/uVnDyp0TY5MKi197+3HWcnYWfnHGyaFthlnGw=
 github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -425,6 +423,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
 github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mfycheng/code-protobuf-api v0.0.0-20240917192150-82a26e4a0108 h1:pFXpZNkx7E1MfUyf3G6kD95L0aPry98WunNH6nszHWY=
+github.com/mfycheng/code-protobuf-api v0.0.0-20240917192150-82a26e4a0108/go.mod h1:pHQm75vydD6Cm2qHAzlimW6drysm489Z4tVxC2zHSsU=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=

pkg/code/server/grpc/chat/v2/server.go

@@ -3,6 +3,7 @@ package chat_v2
 import (
 	"context"
 	"database/sql"
+	"encoding/base64"
 	"fmt"
 	"math"
 	"sync"
@@ -603,7 +604,15 @@ func (s *Server) StartChat(ctx context.Context, req *chatpb.StartChatRequest) (*
 				return &chatpb.StartChatResponse{Result: chatpb.StartChatResponse_DENIED}, nil
 			}
 
-			// TODO: Further verification
+			// TODO: Further verification + Enforcement
+			if !intentRecord.SendPrivatePaymentMetadata.IsChat {
+				log.Warn("intent is not for chat")
+			}
+
+			expectedChatId := base64.StdEncoding.EncodeToString(chatId[:])
+			if intentRecord.SendPrivatePaymentMetadata.ChatId != expectedChatId {
+				log.WithField("expected", expectedChatId).WithField("actual", intentRecord.SendPrivatePaymentMetadata.ChatId).Warn("chat id mismatch")
+			}
 		}
 
 		// At this point, we assume the relationship is valid, and can proceed to recover or create
@@ -639,7 +648,7 @@ func (s *Server) StartChat(ctx context.Context, req *chatpb.StartChatRequest) (*
 
 		err = s.data.ExecuteInTx(ctx, sql.LevelDefault, func(ctx context.Context) error {
 			chatRecord, err = s.data.GetChatByIdV2(ctx, chatId)
-			if err != nil && errors.Is(err, chat.ErrChatNotFound) {
+			if err != nil && !errors.Is(err, chat.ErrChatNotFound) {
 				return fmt.Errorf("failed to check existing chat: %w", err)
 			}
 

pkg/code/server/grpc/user/server.go

@@ -22,6 +22,7 @@ import (
 	"github.com/code-payments/code-server/pkg/code/common"
 	code_data "github.com/code-payments/code-server/pkg/code/data"
 	"github.com/code-payments/code-server/pkg/code/data/account"
+	chat "github.com/code-payments/code-server/pkg/code/data/chat/v2"
 	"github.com/code-payments/code-server/pkg/code/data/intent"
 	"github.com/code-payments/code-server/pkg/code/data/paymentrequest"
 	"github.com/code-payments/code-server/pkg/code/data/phone"
@@ -701,6 +702,12 @@ func (s *identityServer) GetTwitterUser(ctx context.Context, req *userpb.GetTwit
 			return nil, status.Error(codes.Internal, "")
 		}
 
+		var friendChatId *commonpb.ChatId
+		if req.Requestor != nil {
+			// TODO: Validate the requestor
+			friendChatId = chat.GetChatId(base58.Encode(req.Requestor.Value), tipAddress.PublicKey().ToBase58(), true).ToProto()
+		}
+
 		return &userpb.GetTwitterUserResponse{
 			Result: userpb.GetTwitterUserResponse_OK,
 			TwitterUser: &userpb.TwitterUser{
@@ -710,6 +717,11 @@ func (s *identityServer) GetTwitterUser(ctx context.Context, req *userpb.GetTwit
 				ProfilePicUrl: record.ProfilePicUrl,
 				VerifiedType:  record.VerifiedType,
 				FollowerCount: record.FollowerCount,
+				FriendshipCost: &transactionpb.ExchangeDataWithoutRate{
+					Currency:     "usd",
+					NativeAmount: 1.0,
+				},
+				FriendChatId: friendChatId,
 			},
 		}, nil
 	case twitter.ErrUserNotFound:
@@ -720,7 +732,6 @@ func (s *identityServer) GetTwitterUser(ctx context.Context, req *userpb.GetTwit
 		log.WithError(err).Warn("failure getting twitter user info")
 		return nil, status.Error(codes.Internal, "")
 	}
-
 }
 
 func (s *identityServer) markWebhookAsPending(ctx context.Context, id string) error {