summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2020-03-07 11:23:31 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2020-03-07 11:23:31 +0900
commit917726fecc2206321bd41264a66a9a39a2103d57 (patch)
treefa5d3f819a009666bde580c7691836bda34eaa8b /src/server/api
parentRefactor: Better arg name (diff)
downloadsharkey-917726fecc2206321bd41264a66a9a39a2103d57.tar.gz
sharkey-917726fecc2206321bd41264a66a9a39a2103d57.tar.bz2
sharkey-917726fecc2206321bd41264a66a9a39a2103d57.zip
wip #6140
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/charts/active-users.ts6
-rw-r--r--src/server/api/endpoints/charts/drive.ts6
-rw-r--r--src/server/api/endpoints/charts/federation.ts6
-rw-r--r--src/server/api/endpoints/charts/hashtag.ts6
-rw-r--r--src/server/api/endpoints/charts/instance.ts6
-rw-r--r--src/server/api/endpoints/charts/network.ts6
-rw-r--r--src/server/api/endpoints/charts/notes.ts6
-rw-r--r--src/server/api/endpoints/charts/user/drive.ts6
-rw-r--r--src/server/api/endpoints/charts/user/following.ts6
-rw-r--r--src/server/api/endpoints/charts/user/notes.ts6
-rw-r--r--src/server/api/endpoints/charts/user/reactions.ts6
-rw-r--r--src/server/api/endpoints/charts/users.ts6
-rw-r--r--src/server/api/endpoints/stats.ts6
13 files changed, 39 insertions, 39 deletions
diff --git a/src/server/api/endpoints/charts/active-users.ts b/src/server/api/endpoints/charts/active-users.ts
index 327dd4de3e..df427ff4b7 100644
--- a/src/server/api/endpoints/charts/active-users.ts
+++ b/src/server/api/endpoints/charts/active-users.ts
@@ -27,8 +27,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
},
@@ -36,5 +36,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await activeUsersChart.getChart(ps.span as any, ps.limit!, ps.offset!);
+ return await activeUsersChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null);
});
diff --git a/src/server/api/endpoints/charts/drive.ts b/src/server/api/endpoints/charts/drive.ts
index 752cb6f037..e1f279fa0a 100644
--- a/src/server/api/endpoints/charts/drive.ts
+++ b/src/server/api/endpoints/charts/drive.ts
@@ -27,8 +27,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
},
@@ -36,5 +36,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await driveChart.getChart(ps.span as any, ps.limit!, ps.offset!);
+ return await driveChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null);
});
diff --git a/src/server/api/endpoints/charts/federation.ts b/src/server/api/endpoints/charts/federation.ts
index 1701f9bde4..581e42f307 100644
--- a/src/server/api/endpoints/charts/federation.ts
+++ b/src/server/api/endpoints/charts/federation.ts
@@ -27,8 +27,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
},
@@ -36,5 +36,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await federationChart.getChart(ps.span as any, ps.limit!, ps.offset!);
+ return await federationChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null);
});
diff --git a/src/server/api/endpoints/charts/hashtag.ts b/src/server/api/endpoints/charts/hashtag.ts
index bb353e7038..1aa5c86b35 100644
--- a/src/server/api/endpoints/charts/hashtag.ts
+++ b/src/server/api/endpoints/charts/hashtag.ts
@@ -27,8 +27,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
tag: {
@@ -43,5 +43,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await hashtagChart.getChart(ps.span as any, ps.limit!, ps.offset!, ps.tag);
+ return await hashtagChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null, ps.tag);
});
diff --git a/src/server/api/endpoints/charts/instance.ts b/src/server/api/endpoints/charts/instance.ts
index 3ccb2ba126..f0f85ed71a 100644
--- a/src/server/api/endpoints/charts/instance.ts
+++ b/src/server/api/endpoints/charts/instance.ts
@@ -27,8 +27,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
host: {
@@ -44,5 +44,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await instanceChart.getChart(ps.span as any, ps.limit!, ps.offset!, ps.host);
+ return await instanceChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null, ps.host);
});
diff --git a/src/server/api/endpoints/charts/network.ts b/src/server/api/endpoints/charts/network.ts
index 20f5977baa..d1337681a9 100644
--- a/src/server/api/endpoints/charts/network.ts
+++ b/src/server/api/endpoints/charts/network.ts
@@ -27,8 +27,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
},
@@ -36,5 +36,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await networkChart.getChart(ps.span as any, ps.limit!, ps.offset!);
+ return await networkChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null);
});
diff --git a/src/server/api/endpoints/charts/notes.ts b/src/server/api/endpoints/charts/notes.ts
index 5111e299e2..74aa48b36e 100644
--- a/src/server/api/endpoints/charts/notes.ts
+++ b/src/server/api/endpoints/charts/notes.ts
@@ -27,8 +27,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
},
@@ -36,5 +36,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await notesChart.getChart(ps.span as any, ps.limit!, ps.offset!);
+ return await notesChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null);
});
diff --git a/src/server/api/endpoints/charts/user/drive.ts b/src/server/api/endpoints/charts/user/drive.ts
index 576bc7be6a..5aae5bd757 100644
--- a/src/server/api/endpoints/charts/user/drive.ts
+++ b/src/server/api/endpoints/charts/user/drive.ts
@@ -28,8 +28,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
userId: {
@@ -45,5 +45,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await perUserDriveChart.getChart(ps.span as any, ps.limit!, ps.offset!, ps.userId);
+ return await perUserDriveChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null, ps.userId);
});
diff --git a/src/server/api/endpoints/charts/user/following.ts b/src/server/api/endpoints/charts/user/following.ts
index dcdf15b410..9d772c39c9 100644
--- a/src/server/api/endpoints/charts/user/following.ts
+++ b/src/server/api/endpoints/charts/user/following.ts
@@ -28,8 +28,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
userId: {
@@ -45,5 +45,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await perUserFollowingChart.getChart(ps.span as any, ps.limit!, ps.offset!, ps.userId);
+ return await perUserFollowingChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null, ps.userId);
});
diff --git a/src/server/api/endpoints/charts/user/notes.ts b/src/server/api/endpoints/charts/user/notes.ts
index 65c12d6be2..8de7c0c3e4 100644
--- a/src/server/api/endpoints/charts/user/notes.ts
+++ b/src/server/api/endpoints/charts/user/notes.ts
@@ -28,8 +28,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
userId: {
@@ -45,5 +45,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await perUserNotesChart.getChart(ps.span as any, ps.limit!, ps.offset!, ps.userId);
+ return await perUserNotesChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null, ps.userId);
});
diff --git a/src/server/api/endpoints/charts/user/reactions.ts b/src/server/api/endpoints/charts/user/reactions.ts
index c83a203b9c..4c37305fc3 100644
--- a/src/server/api/endpoints/charts/user/reactions.ts
+++ b/src/server/api/endpoints/charts/user/reactions.ts
@@ -28,8 +28,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
userId: {
@@ -45,5 +45,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await perUserReactionsChart.getChart(ps.span as any, ps.limit!, ps.offset!, ps.userId);
+ return await perUserReactionsChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null, ps.userId);
});
diff --git a/src/server/api/endpoints/charts/users.ts b/src/server/api/endpoints/charts/users.ts
index 7f52184f16..18eec384a6 100644
--- a/src/server/api/endpoints/charts/users.ts
+++ b/src/server/api/endpoints/charts/users.ts
@@ -27,8 +27,8 @@ export const meta = {
},
offset: {
- validator: $.optional.num,
- default: 0,
+ validator: $.optional.nullable.num,
+ default: null,
},
},
@@ -36,5 +36,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- return await usersChart.getChart(ps.span as any, ps.limit!, ps.offset!);
+ return await usersChart.getChart(ps.span as any, ps.limit!, ps.offset ? new Date(ps.offset) : null);
});
diff --git a/src/server/api/endpoints/stats.ts b/src/server/api/endpoints/stats.ts
index a6ee240a89..dab05c1675 100644
--- a/src/server/api/endpoints/stats.ts
+++ b/src/server/api/endpoints/stats.ts
@@ -60,9 +60,9 @@ export default define(meta, async () => {
Notes.count({ where: { userHost: null }, cache: 3600000 }),
Users.count({ cache: 3600000 }),
Users.count({ where: { host: null }, cache: 3600000 }),
- federationChart.getChart('hour', 1, 0).then(chart => chart.instance.total[0]),
- driveChart.getChart('hour', 1, 0).then(chart => chart.local.totalSize[0]),
- driveChart.getChart('hour', 1, 0).then(chart => chart.remote.totalSize[0]),
+ federationChart.getChart('hour', 1, null).then(chart => chart.instance.total[0]),
+ driveChart.getChart('hour', 1, null).then(chart => chart.local.totalSize[0]),
+ driveChart.getChart('hour', 1, null).then(chart => chart.remote.totalSize[0]),
]);
return {