Implement v2 chat system with two-way chats

go.mod

@@ -6,7 +6,7 @@ require (
 	firebase.google.com/go/v4 v4.8.0
 	github.com/aws/aws-sdk-go-v2 v0.17.0
 	github.com/bits-and-blooms/bloom/v3 v3.1.0
-	github.com/code-payments/code-protobuf-api v1.16.6
+	github.com/code-payments/code-protobuf-api v1.17.0
 	github.com/emirpasic/gods v1.12.0
 	github.com/envoyproxy/protoc-gen-validate v1.0.4
 	github.com/golang-jwt/jwt/v5 v5.0.0

go.sum

@@ -121,8 +121,8 @@ 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.16.6 h1:QCot0U+4Ar5SdSX4v955FORMsd3Qcf0ZgkoqlGJZzu0=
-github.com/code-payments/code-protobuf-api v1.16.6/go.mod h1:pHQm75vydD6Cm2qHAzlimW6drysm489Z4tVxC2zHSsU=
+github.com/code-payments/code-protobuf-api v1.17.0 h1:zqLrhm54purzsKYb+5CZ3fJZCIVzmuZ31yeARUkuyWE=
+github.com/code-payments/code-protobuf-api v1.17.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=

pkg/code/async/geyser/external_deposit.go

@@ -20,7 +20,7 @@ import (
 	code_data "github.com/code-payments/code-server/pkg/code/data"
 	"github.com/code-payments/code-server/pkg/code/data/account"
 	"github.com/code-payments/code-server/pkg/code/data/balance"
-	"github.com/code-payments/code-server/pkg/code/data/chat"
+	chat_v1 "github.com/code-payments/code-server/pkg/code/data/chat/v1"
 	"github.com/code-payments/code-server/pkg/code/data/deposit"
 	"github.com/code-payments/code-server/pkg/code/data/fulfillment"
 	"github.com/code-payments/code-server/pkg/code/data/intent"
@@ -299,7 +299,7 @@ func processPotentialExternalDeposit(ctx context.Context, conf *conf, data code_
 						chatMessage,
 					)
 				}
-			case chat.ErrMessageAlreadyExists:
+			case chat_v1.ErrMessageAlreadyExists:
 			default:
 				return errors.Wrap(err, "error sending chat message")
 			}
@@ -772,7 +772,7 @@ func delayedUsdcDepositProcessing(
 				chatMessage,
 			)
 		}
-	case chat.ErrMessageAlreadyExists:
+	case chat_v1.ErrMessageAlreadyExists:
 	default:
 		return
 	}

pkg/code/async/geyser/messenger.go

@@ -15,7 +15,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"
-	"github.com/code-payments/code-server/pkg/code/data/chat"
+	chat_v1 "github.com/code-payments/code-server/pkg/code/data/chat/v1"
 	"github.com/code-payments/code-server/pkg/code/push"
 	"github.com/code-payments/code-server/pkg/code/thirdparty"
 	"github.com/code-payments/code-server/pkg/database/query"
@@ -169,13 +169,13 @@ func processPotentialBlockchainMessage(ctx context.Context, data code_data.Provi
 				ctx,
 				data,
 				asciiBaseDomain,
-				chat.ChatTypeExternalApp,
+				chat_v1.ChatTypeExternalApp,
 				true,
 				recipientOwner,
 				chatMessage,
 				false,
 			)
-			if err != nil && err != chat.ErrMessageAlreadyExists {
+			if err != nil && err != chat_v1.ErrMessageAlreadyExists {
 				return errors.Wrap(err, "error persisting chat message")
 			}
 

pkg/code/chat/message_cash_transactions.go

@@ -11,7 +11,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/chat"
+	chat_v1 "github.com/code-payments/code-server/pkg/code/data/chat/v1"
 	"github.com/code-payments/code-server/pkg/code/data/intent"
 )
 
@@ -93,9 +93,9 @@ func SendCashTransactionsExchangeMessage(ctx context.Context, data code_data.Pro
 					return errors.Wrap(err, "error getting original gift card issued intent")
 				}
 
-				chatId := chat.GetChatId(CashTransactionsName, giftCardIssuedIntentRecord.InitiatorOwnerAccount, true)
+				chatId := chat_v1.GetChatId(CashTransactionsName, giftCardIssuedIntentRecord.InitiatorOwnerAccount, true)
 
-				err = data.DeleteChatMessage(ctx, chatId, giftCardIssuedIntentRecord.IntentId)
+				err = data.DeleteChatMessageV1(ctx, chatId, giftCardIssuedIntentRecord.IntentId)
 				if err != nil {
 					return errors.Wrap(err, "error deleting chat message")
 				}
@@ -152,13 +152,13 @@ func SendCashTransactionsExchangeMessage(ctx context.Context, data code_data.Pro
 			ctx,
 			data,
 			CashTransactionsName,
-			chat.ChatTypeInternal,
+			chat_v1.ChatTypeInternal,
 			true,
 			receiver,
 			protoMessage,
 			true,
 		)
-		if err != nil && err != chat.ErrMessageAlreadyExists {
+		if err != nil && err != chat_v1.ErrMessageAlreadyExists {
 			return errors.Wrap(err, "error persisting chat message")
 		}
 	}

pkg/code/chat/message_code_team.go

@@ -9,7 +9,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/chat"
+	chat_v1 "github.com/code-payments/code-server/pkg/code/data/chat/v1"
 	"github.com/code-payments/code-server/pkg/code/data/intent"
 	"github.com/code-payments/code-server/pkg/code/localization"
 )
@@ -20,7 +20,7 @@ func SendCodeTeamMessage(ctx context.Context, data code_data.Provider, receiver
 		ctx,
 		data,
 		CodeTeamName,
-		chat.ChatTypeInternal,
+		chat_v1.ChatTypeInternal,
 		true,
 		receiver,
 		chatMessage,
@@ -48,8 +48,8 @@ func newIncentiveMessage(localizedTextKey string, intentRecord *intent.Record) (
 
 	content := []*chatpb.Content{
 		{
-			Type: &chatpb.Content_Localized{
-				Localized: &chatpb.LocalizedContent{
+			Type: &chatpb.Content_ServerLocalized{
+				ServerLocalized: &chatpb.ServerLocalizedContent{
 					KeyOrText: localizedTextKey,
 				},
 			},

pkg/code/chat/message_kin_purchases.go

@@ -11,14 +11,14 @@ 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/chat"
+	chat_v1 "github.com/code-payments/code-server/pkg/code/data/chat/v1"
 	"github.com/code-payments/code-server/pkg/code/localization"
 )
 
 // GetKinPurchasesChatId returns the chat ID for the Kin Purchases chat for a
 // given owner account
-func GetKinPurchasesChatId(owner *common.Account) chat.ChatId {
-	return chat.GetChatId(KinPurchasesName, owner.PublicKey().ToBase58(), true)
+func GetKinPurchasesChatId(owner *common.Account) chat_v1.ChatId {
+	return chat_v1.GetChatId(KinPurchasesName, owner.PublicKey().ToBase58(), true)
 }
 
 // SendKinPurchasesMessage sends a message to the Kin Purchases chat.
@@ -27,7 +27,7 @@ func SendKinPurchasesMessage(ctx context.Context, data code_data.Provider, recei
 		ctx,
 		data,
 		KinPurchasesName,
-		chat.ChatTypeInternal,
+		chat_v1.ChatTypeInternal,
 		true,
 		receiver,
 		chatMessage,
@@ -40,8 +40,8 @@ func SendKinPurchasesMessage(ctx context.Context, data code_data.Provider, recei
 func ToUsdcDepositedMessage(signature string, ts time.Time) (*chatpb.ChatMessage, error) {
 	content := []*chatpb.Content{
 		{
-			Type: &chatpb.Content_Localized{
-				Localized: &chatpb.LocalizedContent{
+			Type: &chatpb.Content_ServerLocalized{
+				ServerLocalized: &chatpb.ServerLocalizedContent{
 					KeyOrText: localization.ChatMessageUsdcDeposited,
 				},
 			},
@@ -60,8 +60,8 @@ func NewUsdcBeingConvertedMessage(ts time.Time) (*chatpb.ChatMessage, error) {
 
 	content := []*chatpb.Content{
 		{
-			Type: &chatpb.Content_Localized{
-				Localized: &chatpb.LocalizedContent{
+			Type: &chatpb.Content_ServerLocalized{
+				ServerLocalized: &chatpb.ServerLocalizedContent{
 					KeyOrText: localization.ChatMessageUsdcBeingConverted,
 				},
 			},
@@ -79,8 +79,8 @@ func ToKinAvailableForUseMessage(signature string, ts time.Time, purchases ...*t
 
 	content := []*chatpb.Content{
 		{
-			Type: &chatpb.Content_Localized{
-				Localized: &chatpb.LocalizedContent{
+			Type: &chatpb.Content_ServerLocalized{
+				ServerLocalized: &chatpb.ServerLocalizedContent{
 					KeyOrText: localization.ChatMessageKinAvailableForUse,
 				},
 			},

pkg/code/chat/message_merchant.go

@@ -13,7 +13,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/action"
-	"github.com/code-payments/code-server/pkg/code/data/chat"
+	chat_v1 "github.com/code-payments/code-server/pkg/code/data/chat/v1"
 	"github.com/code-payments/code-server/pkg/code/data/intent"
 )
 
@@ -36,7 +36,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
 	// the merchant. Representation in the UI may differ (ie. 2 and 3 are grouped),
 	// but this is the most flexible solution with the chat model.
 	chatTitle := PaymentsName
-	chatType := chat.ChatTypeInternal
+	chatType := chat_v1.ChatTypeInternal
 	isVerifiedChat := false
 
 	exchangeData, ok := getExchangeDataFromIntent(intentRecord)
@@ -59,7 +59,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
 
 			if paymentRequestRecord.Domain != nil {
 				chatTitle = *paymentRequestRecord.Domain
-				chatType = chat.ChatTypeExternalApp
+				chatType = chat_v1.ChatTypeExternalApp
 				isVerifiedChat = paymentRequestRecord.IsVerified
 			}
 
@@ -87,7 +87,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
 					// and will have merchant payments appear in the verified merchant
 					// chat.
 					chatTitle = *destinationAccountInfoRecord.RelationshipTo
-					chatType = chat.ChatTypeExternalApp
+					chatType = chat_v1.ChatTypeExternalApp
 					isVerifiedChat = true
 					verbAndExchangeDataByMessageReceiver[intentRecord.SendPrivatePaymentMetadata.DestinationOwnerAccount] = &verbAndExchangeData{
 						verb:         chatpb.ExchangeDataContent_RECEIVED,
@@ -107,7 +107,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
 					// and will have merchant payments appear in the verified merchant
 					// chat.
 					chatTitle = *destinationAccountInfoRecord.RelationshipTo
-					chatType = chat.ChatTypeExternalApp
+					chatType = chat_v1.ChatTypeExternalApp
 					isVerifiedChat = true
 					verbAndExchangeDataByMessageReceiver[intentRecord.SendPublicPaymentMetadata.DestinationOwnerAccount] = &verbAndExchangeData{
 						verb:         chatpb.ExchangeDataContent_RECEIVED,
@@ -126,7 +126,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
 			// and will have merchant payments appear in the verified merchant
 			// chat.
 			chatTitle = *destinationAccountInfoRecord.RelationshipTo
-			chatType = chat.ChatTypeExternalApp
+			chatType = chat_v1.ChatTypeExternalApp
 			isVerifiedChat = true
 			verbAndExchangeDataByMessageReceiver[intentRecord.ExternalDepositMetadata.DestinationOwnerAccount] = &verbAndExchangeData{
 				verb:         chatpb.ExchangeDataContent_RECEIVED,
@@ -171,7 +171,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
 			protoMessage,
 			verbAndExchangeData.verb != chatpb.ExchangeDataContent_RECEIVED || !isVerifiedChat,
 		)
-		if err != nil && err != chat.ErrMessageAlreadyExists {
+		if err != nil && err != chat_v1.ErrMessageAlreadyExists {
 			return nil, errors.Wrap(err, "error persisting chat message")
 		}
 

pkg/code/chat/message_tips.go

@@ -9,7 +9,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/chat"
+	chat_v1 "github.com/code-payments/code-server/pkg/code/data/chat/v1"
 	"github.com/code-payments/code-server/pkg/code/data/intent"
 )
 
@@ -70,13 +70,13 @@ func SendTipsExchangeMessage(ctx context.Context, data code_data.Provider, inten
 			ctx,
 			data,
 			TipsName,
-			chat.ChatTypeInternal,
+			chat_v1.ChatTypeInternal,
 			true,
 			receiver,
 			protoMessage,
 			verb != chatpb.ExchangeDataContent_RECEIVED_TIP,
 		)
-		if err != nil && err != chat.ErrMessageAlreadyExists {
+		if err != nil && err != chat_v1.ErrMessageAlreadyExists {
 			return nil, errors.Wrap(err, "error persisting chat message")
 		}
 

pkg/code/chat/sender.go

@@ -12,7 +12,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/chat"
+	chat_v1 "github.com/code-payments/code-server/pkg/code/data/chat/v1"
 )
 
 // SendChatMessage sends a chat message to a receiving owner account.
@@ -24,13 +24,13 @@ func SendChatMessage(
 	ctx context.Context,
 	data code_data.Provider,
 	chatTitle string,
-	chatType chat.ChatType,
+	chatType chat_v1.ChatType,
 	isVerifiedChat bool,
 	receiver *common.Account,
 	protoMessage *chatpb.ChatMessage,
 	isSilentMessage bool,
 ) (canPushMessage bool, err error) {
-	chatId := chat.GetChatId(chatTitle, receiver.PublicKey().ToBase58(), isVerifiedChat)
+	chatId := chat_v1.GetChatId(chatTitle, receiver.PublicKey().ToBase58(), isVerifiedChat)
 
 	if protoMessage.Cursor != nil {
 		// Let the utilities and GetMessages RPC handle cursors
@@ -58,13 +58,13 @@ func SendChatMessage(
 	canPersistMessage := true
 	canPushMessage = !isSilentMessage
 
-	existingChatRecord, err := data.GetChatById(ctx, chatId)
+	existingChatRecord, err := data.GetChatByIdV1(ctx, chatId)
 	switch err {
 	case nil:
 		canPersistMessage = !existingChatRecord.IsUnsubscribed
 		canPushMessage = canPushMessage && canPersistMessage && !existingChatRecord.IsMuted
-	case chat.ErrChatNotFound:
-		chatRecord := &chat.Chat{
+	case chat_v1.ErrChatNotFound:
+		chatRecord := &chat_v1.Chat{
 			ChatId:     chatId,
 			ChatType:   chatType,
 			ChatTitle:  chatTitle,
@@ -79,16 +79,16 @@ func SendChatMessage(
 			CreatedAt: time.Now(),
 		}
 
-		err = data.PutChat(ctx, chatRecord)
-		if err != nil && err != chat.ErrChatAlreadyExists {
+		err = data.PutChatV1(ctx, chatRecord)
+		if err != nil && err != chat_v1.ErrChatAlreadyExists {
 			return false, err
 		}
 	default:
 		return false, err
 	}
 
 	if canPersistMessage {
-		messageRecord := &chat.Message{
+		messageRecord := &chat_v1.Message{
 			ChatId: chatId,
 
 			MessageId: base58.Encode(messageId),
@@ -100,7 +100,7 @@ func SendChatMessage(
 			Timestamp: ts.AsTime(),
 		}
 
-		err = data.PutChatMessage(ctx, messageRecord)
+		err = data.PutChatMessageV1(ctx, messageRecord)
 		if err != nil {
 			return false, err
 		}