Merge branch 'develop'

4 files changed, 20 insertions, 10 deletions

diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts
index 3631208da7..f46fa208df 100644
--- a/src/server/api/endpoints/notes/global-timeline.ts
+++ b/src/server/api/endpoints/notes/global-timeline.ts
@@ -89,9 +89,11 @@ export default define(meta, async (ps, user) => {
 
 	const timeline = await query.take(ps.limit!).getMany();
 
-	if (user) {
-		activeUsersChart.update(user);
-	}
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.update(user);
+		}
+	});
 
 	return await Notes.packMany(timeline, user);
 });
diff --git a/src/server/api/endpoints/notes/hybrid-timeline.ts b/src/server/api/endpoints/notes/hybrid-timeline.ts
index c05c8dedd6..7be13fc47f 100644
--- a/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -192,9 +192,11 @@ export default define(meta, async (ps, user) => {
 
 	const timeline = await query.take(ps.limit!).getMany();
 
-	if (user) {
-		activeUsersChart.update(user);
-	}
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.update(user);
+		}
+	});
 
 	return await Notes.packMany(timeline, user);
 });
diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts
index ca84fc6ef9..73cbebace2 100644
--- a/src/server/api/endpoints/notes/local-timeline.ts
+++ b/src/server/api/endpoints/notes/local-timeline.ts
@@ -125,9 +125,11 @@ export default define(meta, async (ps, user) => {
 
 	const timeline = await query.take(ps.limit!).getMany();
 
-	if (user) {
-		activeUsersChart.update(user);
-	}
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.update(user);
+		}
+	});
 
 	return await Notes.packMany(timeline, user);
 });
diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts
index 5e692db389..f9442f8b90 100644
--- a/src/server/api/endpoints/notes/timeline.ts
+++ b/src/server/api/endpoints/notes/timeline.ts
@@ -177,7 +177,11 @@ export default define(meta, async (ps, user) => {
 
 	const timeline = await query.take(ps.limit!).getMany();
 
-	activeUsersChart.update(user);
+	process.nextTick(() => {
+		if (user) {
+			activeUsersChart.update(user);
+		}
+	});
 
 	return await Notes.packMany(timeline, user);
 });