Merge pull request #399 from cloudflare/sven/fix-properties-parsing-neon2

more fix properties parsing with Neon

backend/src/activitypub/objects/index.ts

@@ -128,7 +128,15 @@ export async function cacheObject(
 	}
 
 	{
-		const properties = JSON.parse(row.properties)
+		let properties
+		if (typeof row.properties === 'object') {
+			// neon uses JSONB for properties which is returned as a deserialized
+			// object.
+			properties = row.properties
+		} else {
+			// D1 uses a string for JSON properties
+			properties = JSON.parse(row.properties)
+		}
 		const object = {
 			published: new Date(row.cdate).toISOString(),
 			...properties,
@@ -206,7 +214,15 @@ export async function getObjectBy(db: Database, key: ObjectByKey, value: string)
 	}
 
 	const result: any = results[0]
-	const properties = JSON.parse(result.properties)
+	let properties
+	if (typeof result.properties === 'object') {
+		// neon uses JSONB for properties which is returned as a deserialized
+		// object.
+		properties = result.properties
+	} else {
+		// D1 uses a string for JSON properties
+		properties = JSON.parse(result.properties)
+	}
 
 	return {
 		published: new Date(result.cdate).toISOString(),

backend/src/mastodon/idempotency.ts

@@ -36,7 +36,15 @@ export async function hasKey(db: Database, key: string): Promise<APObject | null
 	}
 
 	const result = results[0]
-	const properties = JSON.parse(result.properties)
+	let properties
+	if (typeof result.properties === 'object') {
+		// neon uses JSONB for properties which is returned as a deserialized
+		// object.
+		properties = result.properties
+	} else {
+		// D1 uses a string for JSON properties
+		properties = JSON.parse(result.properties)
+	}
 
 	return {
 		published: new Date(result.cdate).toISOString(),