Merge branch 'master' into slowcord

api/package.json

@@ -49,7 +49,7 @@
 		"@types/morgan": "^1.9.3",
 		"@types/multer": "^1.4.5",
 		"@types/node": "^14.17.9",
-		"@types/node-fetch": "^2.5.7",
+		"@types/node-fetch": "^2.5.5",
 		"@types/supertest": "^2.0.11",
 		"@zerollup/ts-transform-paths": "^1.7.18",
 		"jest": "^27.2.5",
@@ -86,7 +86,7 @@
 		"missing-native-js-functions": "^1.2.18",
 		"morgan": "^1.10.0",
 		"multer": "^1.4.2",
-		"node-fetch": "^3.1.1",
+		"node-fetch": "^2.6.2",
 		"patch-package": "^6.4.7",
 		"picocolors": "^1.0.0",
 		"proxy-agent": "^5.0.0",

bundle/package.json

@@ -93,6 +93,7 @@
 		"missing-native-js-functions": "^1.2.18",
 		"morgan": "^1.10.0",
 		"multer": "^1.4.2",
+		"nan": "^2.15.0",
 		"nanocolors": "^0.2.12",
 		"node-fetch": "^2.6.2",
 		"node-os-utils": "^1.3.5",

cdn/package.json

@@ -54,7 +54,7 @@
 		"missing-native-js-functions": "^1.2.17",
 		"multer": "^1.4.2",
 		"nanocolors": "^0.2.12",
-		"node-fetch": "^2.6.7",
+		"node-fetch": "^2.6.2",
 		"supertest": "^6.1.6",
 		"typescript": "^4.1.2"
 	},

util/src/entities/ReadState.ts

@@ -31,8 +31,17 @@ export class ReadState extends BaseClass {
 	})
 	user: User;
 
+	// fully read marker
 	@Column({ nullable: true })
-	last_message_id: string;
+	last_message_id: string; 
+	
+	// public read receipt
+	@Column({ nullable: true })
+	public_ack: string;
+
+	// notification cursor / private read receipt
+	@Column({ nullable: true })
+	notifications_cursor: string;
 
 	@Column({ nullable: true })
 	last_pin_timestamp?: Date;