Improve error handling of API (#4345)

* wip

* wip

* wip

* Update attached_notes.ts

* wip

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update call.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* :v:

* Fix

12 files changed, 36 insertions, 60 deletions

diff --git a/src/server/api/endpoints/charts/active-users.ts b/src/server/api/endpoints/charts/active-users.ts
index 9adf7bd388..11f86d0baa 100644
--- a/src/server/api/endpoints/charts/active-users.ts
+++ b/src/server/api/endpoints/charts/active-users.ts
@@ -27,8 +27,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await activeUsersChart.getChart(ps.span as any, ps.limit);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await activeUsersChart.getChart(ps.span as any, ps.limit);
+});
diff --git a/src/server/api/endpoints/charts/drive.ts b/src/server/api/endpoints/charts/drive.ts
index 0f1106e123..9244ef7481 100644
--- a/src/server/api/endpoints/charts/drive.ts
+++ b/src/server/api/endpoints/charts/drive.ts
@@ -27,8 +27,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await driveChart.getChart(ps.span as any, ps.limit);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await driveChart.getChart(ps.span as any, ps.limit);
+});
diff --git a/src/server/api/endpoints/charts/federation.ts b/src/server/api/endpoints/charts/federation.ts
index 6b9cfc4510..c98c9f6cbb 100644
--- a/src/server/api/endpoints/charts/federation.ts
+++ b/src/server/api/endpoints/charts/federation.ts
@@ -27,8 +27,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await federationChart.getChart(ps.span as any, ps.limit);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await federationChart.getChart(ps.span as any, ps.limit);
+});
diff --git a/src/server/api/endpoints/charts/hashtag.ts b/src/server/api/endpoints/charts/hashtag.ts
index e1127fe388..5905fdc1a2 100644
--- a/src/server/api/endpoints/charts/hashtag.ts
+++ b/src/server/api/endpoints/charts/hashtag.ts
@@ -34,8 +34,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await hashtagChart.getChart(ps.span as any, ps.limit, ps.tag);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await hashtagChart.getChart(ps.span as any, ps.limit, ps.tag);
+});
diff --git a/src/server/api/endpoints/charts/instance.ts b/src/server/api/endpoints/charts/instance.ts
index 9b5f33024a..e47334c7ce 100644
--- a/src/server/api/endpoints/charts/instance.ts
+++ b/src/server/api/endpoints/charts/instance.ts
@@ -35,8 +35,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await instanceChart.getChart(ps.span as any, ps.limit, ps.host);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await instanceChart.getChart(ps.span as any, ps.limit, ps.host);
+});
diff --git a/src/server/api/endpoints/charts/network.ts b/src/server/api/endpoints/charts/network.ts
index db13f13030..fa1917f753 100644
--- a/src/server/api/endpoints/charts/network.ts
+++ b/src/server/api/endpoints/charts/network.ts
@@ -27,8 +27,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await networkChart.getChart(ps.span as any, ps.limit);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await networkChart.getChart(ps.span as any, ps.limit);
+});
diff --git a/src/server/api/endpoints/charts/notes.ts b/src/server/api/endpoints/charts/notes.ts
index 4877df6080..006a8d6e21 100644
--- a/src/server/api/endpoints/charts/notes.ts
+++ b/src/server/api/endpoints/charts/notes.ts
@@ -27,8 +27,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await notesChart.getChart(ps.span as any, ps.limit);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await notesChart.getChart(ps.span as any, ps.limit);
+});
diff --git a/src/server/api/endpoints/charts/user/drive.ts b/src/server/api/endpoints/charts/user/drive.ts
index 556651d335..6383ddf2f8 100644
--- a/src/server/api/endpoints/charts/user/drive.ts
+++ b/src/server/api/endpoints/charts/user/drive.ts
@@ -37,8 +37,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await perUserDriveChart.getChart(ps.span as any, ps.limit, ps.userId);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await perUserDriveChart.getChart(ps.span as any, ps.limit, ps.userId);
+});
diff --git a/src/server/api/endpoints/charts/user/following.ts b/src/server/api/endpoints/charts/user/following.ts
index ccc83952f3..9443b56a40 100644
--- a/src/server/api/endpoints/charts/user/following.ts
+++ b/src/server/api/endpoints/charts/user/following.ts
@@ -37,8 +37,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await perUserFollowingChart.getChart(ps.span as any, ps.limit, ps.userId);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return  await perUserFollowingChart.getChart(ps.span as any, ps.limit, ps.userId);
+});
diff --git a/src/server/api/endpoints/charts/user/notes.ts b/src/server/api/endpoints/charts/user/notes.ts
index 3296771c68..da642fc761 100644
--- a/src/server/api/endpoints/charts/user/notes.ts
+++ b/src/server/api/endpoints/charts/user/notes.ts
@@ -37,8 +37,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await perUserNotesChart.getChart(ps.span as any, ps.limit, ps.userId);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await perUserNotesChart.getChart(ps.span as any, ps.limit, ps.userId);
+});
diff --git a/src/server/api/endpoints/charts/user/reactions.ts b/src/server/api/endpoints/charts/user/reactions.ts
index be228b5f7d..e440b3ae34 100644
--- a/src/server/api/endpoints/charts/user/reactions.ts
+++ b/src/server/api/endpoints/charts/user/reactions.ts
@@ -37,8 +37,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await perUserReactionsChart.getChart(ps.span as any, ps.limit, ps.userId);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await perUserReactionsChart.getChart(ps.span as any, ps.limit, ps.userId);
+});
diff --git a/src/server/api/endpoints/charts/users.ts b/src/server/api/endpoints/charts/users.ts
index e474e29970..ea32b7afd8 100644
--- a/src/server/api/endpoints/charts/users.ts
+++ b/src/server/api/endpoints/charts/users.ts
@@ -27,8 +27,6 @@ export const meta = {
 	}
 };
 
-export default define(meta, (ps) => new Promise(async (res, rej) => {
-	const stats = await usersChart.getChart(ps.span as any, ps.limit);
-
-	res(stats);
-}));
+export default define(meta, async (ps) => {
+	return await usersChart.getChart(ps.span as any, ps.limit);
+});