Merge pull request #665 from nyaruka/fix-FBA-referral-dates

Fix FBA timestamps that sometimes are in seconds instead of milliseconds

handlers/meta/facebook_test.go

@@ -183,6 +183,17 @@ var facebookIncomingTests = []IncomingTestCase{
 		},
 		PrepRequest: addValidSignature,
 	},
+	{
+		Label:                "Receive Referral timestamp seconds",
+		URL:                  "/c/fba/receive",
+		Data:                 string(test.ReadFile("./testdata/fba/referral_seconds.json")),
+		ExpectedRespStatus:   200,
+		ExpectedBodyContains: `"referrer_id":"referral id"`,
+		ExpectedEvents: []ExpectedEvent{
+			{Type: courier.EventTypeReferral, URN: "facebook:5678", Time: time.Date(2023, 12, 3, 10, 25, 11, 0, time.UTC), Extra: map[string]string{"referrer_id": "referral id", "source": "referral source", "type": "referral type", "ad_id": "ad id"}},
+		},
+		PrepRequest: addValidSignature,
+	},
 	{
 		Label:              "Receive Fallback Attachment",
 		URL:                "/c/fba/receive",

handlers/meta/handlers.go

@@ -409,8 +409,15 @@ func (h *handler) processFacebookInstagramPayload(ctx context.Context, channel c
 			continue
 		}
 
-		// create our date from the timestamp (they give us millis, arg is nanos)
-		date := time.Unix(0, msg.Timestamp*1000000).UTC()
+		var date time.Time
+
+		if msg.Timestamp >= 10_000_000_000 {
+			// create our date from the timestamp (they give us millis, arg is nanos)
+			date = time.Unix(0, msg.Timestamp*1000000).UTC()
+		} else {
+			// create our date from the timestamp (they give us seconds)
+			date = time.Unix(msg.Timestamp, 0).UTC()
+		}
 
 		sender := msg.Sender.UserRef
 		if sender == "" {

handlers/meta/testdata/fba/referral_seconds.json

@@ -0,0 +1,27 @@
+{
+	"object": "page",
+	"entry": [
+		{
+			"id": "12345",
+			"messaging": [
+				{
+					"referral": {
+						"ref": "referral id",
+						"ad_id": "ad id",
+						"source": "referral source",
+						"type": "referral type"
+					},
+					"recipient": {
+						"id": "12345"
+					},
+					"sender": {
+						"id": "5678",
+						"user_ref": "5678"
+					},
+					"timestamp": 1701599111
+				}
+			],
+			"time": 1701599116216
+		}
+	]
+}