merge: upstream changes

2023-10-18 19:48:03 +02:00 · 2023-10-18 19:48:03 +02:00 · 4b230d792c
commit 4b230d792c
parent c4b0f47ba1 de6e15e36d
63 changed files with 1250 additions and 830 deletions
--- a/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts
+++ b/packages/backend/src/server/api/endpoints/admin/get-user-ips.ts
@ -41,7 +41,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-

 			return ips.map(x => ({
 				ip: x.ip,
-				createdAt: this.idService.parse(x.id).date.toISOString(),
+				createdAt: x.createdAt.toISOString(),
 			}));
 		});
 	}