chats: add (temporary) plumbing for tip notifications.

go.mod

@@ -6,7 +6,8 @@ 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.19.0
+	github.com/dghubble/oauth1 v0.7.3
 	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
@@ -41,6 +42,7 @@ require (
 	golang.org/x/crypto v0.21.0
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
 	golang.org/x/net v0.22.0
+	golang.org/x/sync v0.7.0
 	golang.org/x/text v0.14.0
 	golang.org/x/time v0.5.0
 	google.golang.org/api v0.170.0
@@ -119,7 +121,6 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/oauth2 v0.18.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/appengine/v2 v2.0.1 // indirect
@@ -130,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-20241010162320-5dac31db232d

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.16.6 h1:QCot0U+4Ar5SdSX4v955FORMsd3Qcf0ZgkoqlGJZzu0=
-github.com/code-payments/code-protobuf-api v1.16.6/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=
@@ -141,6 +139,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dghubble/oauth1 v0.7.3 h1:EkEM/zMDMp3zOsX2DC/ZQ2vnEX3ELK0/l9kb+vs4ptE=
+github.com/dghubble/oauth1 v0.7.3/go.mod h1:oxTe+az9NSMIucDPDCCtzJGsPhciJV33xocHfcR2sVY=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/docker/cli v20.10.7+incompatible h1:pv/3NqibQKphWZiAskMzdz8w0PRbtTaEB+f6NwdU7Is=
@@ -423,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-20241010162320-5dac31db232d h1:pOwndvvkUvWXzoiJIIo5wiPT/IP67J5AJqF4sLPdKcY=
+github.com/mfycheng/code-protobuf-api v0.0.0-20241010162320-5dac31db232d/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/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"
@@ -165,17 +165,17 @@ func processPotentialBlockchainMessage(ctx context.Context, data code_data.Provi
 				return errors.Wrap(err, "error creating proto message")
 			}
 
-			canPush, err := chat_util.SendChatMessage(
+			canPush, err := chat_util.SendNotificationChatMessageV1(
 				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/async/user/twitter.go

@@ -4,13 +4,15 @@ import (
 	"context"
 	"crypto/ed25519"
 	"database/sql"
+	"fmt"
 	"strings"
 	"time"
 
 	"github.com/google/uuid"
 	"github.com/mr-tron/base58"
 	"github.com/newrelic/go-agent/v3/newrelic"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 
 	commonpb "github.com/code-payments/code-protobuf-api/generated/go/common/v1"
 	userpb "github.com/code-payments/code-protobuf-api/generated/go/user/v1"
@@ -103,6 +105,8 @@ func (p *service) twitterUserInfoUpdateWorker(serviceCtx context.Context, interv
 }
 
 func (p *service) processNewTwitterRegistrations(ctx context.Context) error {
+	log := p.log.WithField("method", "processNewTwitterRegistrations")
+
 	tweets, err := p.findNewRegistrationTweets(ctx)
 	if err != nil {
 		return errors.Wrap(err, "error finding new registration tweets")
@@ -113,6 +117,11 @@ func (p *service) processNewTwitterRegistrations(ctx context.Context) error {
 			return errors.Errorf("author missing in tweet %s", tweet.ID)
 		}
 
+		log := log.WithFields(logrus.Fields{
+			"tweet":    tweet.ID,
+			"username": tweet.AdditionalMetadata.Author,
+		})
+
 		// Attempt to find a verified tip account from the registration tweet
 		tipAccount, registrationNonce, err := p.findVerifiedTipAccountRegisteredInTweet(ctx, tweet)
 		switch err {
@@ -140,7 +149,21 @@ func (p *service) processNewTwitterRegistrations(ctx context.Context) error {
 
 		switch err {
 		case nil:
-			go push_util.SendTwitterAccountConnectedPushNotification(ctx, p.data, p.pusher, tipAccount)
+			// todo: all of these success handlers are fire and forget best-effort delivery
+
+			go func() {
+				err := push_util.SendTwitterAccountConnectedPushNotification(ctx, p.data, p.pusher, tipAccount)
+				if err != nil {
+					log.WithError(err).Warn("failure sending success push")
+				}
+			}()
+
+			go func() {
+				err := p.sendRegistrationSuccessReply(ctx, tweet.ID, tweet.AdditionalMetadata.Author.Username)
+				if err != nil {
+					log.WithError(err).Warn("failure sending success reply")
+				}
+			}()
 		case twitter.ErrDuplicateTipAddress:
 			err = p.data.ExecuteInTx(ctx, sql.LevelDefault, func(ctx context.Context) error {
 				err = p.data.MarkTwitterNonceAsUsed(ctx, tweet.ID, *registrationNonce)
@@ -171,6 +194,14 @@ func (p *service) processNewTwitterRegistrations(ctx context.Context) error {
 func (p *service) refreshTwitterUserInfo(ctx context.Context, username string) error {
 	user, err := p.twitterClient.GetUserByUsername(ctx, username)
 	if err != nil {
+		if strings.Contains(strings.ToLower(err.Error()), "could not find user with username") || strings.Contains(strings.ToLower(err.Error()), "user has been suspended") {
+			err = p.onTwitterUsernameNotFound(ctx, username)
+			if err != nil {
+				return errors.Wrap(err, "error updating cached user state")
+			}
+			return nil
+		}
+
 		return errors.Wrap(err, "error getting user info from twitter")
 	}
 
@@ -334,6 +365,36 @@ func (p *service) findVerifiedTipAccountRegisteredInTweet(ctx context.Context, t
 	return nil, nil, errTwitterRegistrationNotFound
 }
 
+func (p *service) sendRegistrationSuccessReply(ctx context.Context, regristrationTweetId, username string) error {
+	// todo: localize this
+	message := fmt.Sprintf(
+		"@%s your X account is now connected. Share this link to receive tips: https://tipcard.getcode.com/x/%s",
+		username,
+		username,
+	)
+	_, err := p.twitterClient.SendReply(ctx, regristrationTweetId, message)
+	return err
+}
+
+func (p *service) onTwitterUsernameNotFound(ctx context.Context, username string) error {
+	record, err := p.data.GetTwitterUserByUsername(ctx, username)
+	switch err {
+	case nil:
+	case twitter.ErrUserNotFound:
+		return nil
+	default:
+		return errors.Wrap(err, "error getting cached twitter user")
+	}
+
+	record.LastUpdatedAt = time.Now()
+
+	err = p.data.SaveTwitterUser(ctx, record)
+	if err != nil {
+		return errors.Wrap(err, "error updating cached twitter user")
+	}
+	return nil
+}
+
 func toProtoVerifiedType(value string) userpb.TwitterUser_VerifiedType {
 	switch value {
 	case "blue":

pkg/code/chat/chat.go

@@ -8,6 +8,7 @@ const (
 	KinPurchasesName     = "Kin Purchases"
 	PaymentsName         = "Payments" // Renamed to Web Payments on client
 	TipsName             = "Tips"
+	TwoWayChatName       = "Two Way Chat"
 
 	// Test chats used for unit/integration testing only
 	TestCantMuteName        = "TestCantMute"
@@ -45,6 +46,11 @@ var (
 			CanMute:              true,
 			CanUnsubscribe:       false,
 		},
+		TwoWayChatName: {
+			TitleLocalizationKey: localization.ChatTitleTwoWay,
+			CanMute:              true,
+			CanUnsubscribe:       false,
+		},
 
 		TestCantMuteName: {
 			TitleLocalizationKey: "n/a",

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")
 				}
@@ -148,17 +148,17 @@ func SendCashTransactionsExchangeMessage(ctx context.Context, data code_data.Pro
 			return errors.Wrap(err, "error creating proto chat message")
 		}
 
-		_, err = SendChatMessage(
+		_, err = SendNotificationChatMessageV1(
 			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,18 +9,18 @@ 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"
 )
 
 // SendCodeTeamMessage sends a message to the Code Team chat.
 func SendCodeTeamMessage(ctx context.Context, data code_data.Provider, receiver *common.Account, chatMessage *chatpb.ChatMessage) (bool, error) {
-	return SendChatMessage(
+	return SendNotificationChatMessageV1(
 		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,23 +11,23 @@ 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.
 func SendKinPurchasesMessage(ctx context.Context, data code_data.Provider, receiver *common.Account, chatMessage *chatpb.ChatMessage) (bool, error) {
-	return SendChatMessage(
+	return SendNotificationChatMessageV1(
 		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,
 				},
 			},