messaging: fix listener message activity notifications and integrate tips

Author: Jeff Yanta

intent/payment_metadata.go

@@ -20,6 +20,16 @@ var (
 	ErrInvalidPaymentMetadata = errors.New("invalid payment metadata")
 )
 
+func GetPaymentAmount(ctx context.Context, codeData codedata.Provider, intentID *commonpb.IntentId) (uint64, error) {
+	intentRecord, err := codeData.GetIntent(ctx, model.IntentIDString(intentID))
+	if err == codeintent.ErrIntentNotFound {
+		return 0, ErrNoPaymentMetadata
+	} else if err != nil {
+		return 0, err
+	}
+	return intentRecord.SendPublicPaymentMetadata.Quantity, nil
+}
+
 func LoadPaymentMetadata(ctx context.Context, codeData codedata.Provider, intentID *commonpb.IntentId, dst proto.Message) (*codeintent.Record, error) {
 	intentRecord, err := codeData.GetIntent(ctx, model.IntentIDString(intentID))
 	if err == codeintent.ErrIntentNotFound {

messaging/server.go

@@ -452,22 +452,44 @@ func (s *Server) SendMessage(ctx context.Context, req *messagingpb.SendMessageRe
 			return nil, status.Errorf(codes.Internal, "failed to mark intent as fulfilled")
 		}
 
-		_, err = activity.SendNotification(
-			ctx,
-			s.activityFeeds,
-			activitypb.ActivityFeedType_TRANSACTION_HISTORY,
-			userID,
-			activity.NewSendListenerMessageNotificationBuilder(
+		paymentAmount, err := intent.GetPaymentAmount(ctx, s.codeData, req.PaymentIntent)
+		if err != nil {
+			log.Warn("Failed to get payment amount", zap.Error(err))
+			return nil, status.Errorf(codes.Internal, "failed to get payment amount")
+		}
+
+		var notificationBuilder activity.NotificationBuilder
+		switch req.Content[0].Type.(type) {
+		case *messagingpb.Content_Text, *messagingpb.Content_Reply:
+			notificationBuilder = activity.NewSendListenerMessageNotificationBuilder(
 				ctx,
 				userID,
 				req.ChatId,
 				sent.MessageId,
-				flags.StartGroupFee,
+				paymentAmount,
 				sent.Ts.AsTime(),
-			),
-		)
-		if err != nil {
-			log.Warn("Failed to send activity feed notification", zap.Error(err))
+			)
+		case *messagingpb.Content_Tip:
+			notificationBuilder = activity.NewSendTipNotificationBuilder(
+				ctx,
+				userID,
+				req.ChatId,
+				sent.MessageId,
+				paymentAmount,
+				sent.Ts.AsTime(),
+			)
+		}
+		if notificationBuilder != nil {
+			_, err = activity.SendNotification(
+				ctx,
+				s.activityFeeds,
+				activitypb.ActivityFeedType_TRANSACTION_HISTORY,
+				userID,
+				notificationBuilder,
+			)
+			if err != nil {
+				log.Warn("Failed to send activity feed notification", zap.Error(err))
+			}
 		}
 	}