summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-08-24 14:55:58 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-08-24 14:55:58 +0900
commit13624ea7c25870162d1c60e82c3a0e064e8478da (patch)
treed12bcea5ba8630dd01cb62857842125055ab6ade /src/server/api
parent8.7.0 (diff)
downloadsharkey-13624ea7c25870162d1c60e82c3a0e064e8478da.tar.gz
sharkey-13624ea7c25870162d1c60e82c3a0e064e8478da.tar.bz2
sharkey-13624ea7c25870162d1c60e82c3a0e064e8478da.zip
バグ修正など
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/chart.ts54
1 files changed, 49 insertions, 5 deletions
diff --git a/src/server/api/endpoints/chart.ts b/src/server/api/endpoints/chart.ts
index a58f0b163e..da3476f067 100644
--- a/src/server/api/endpoints/chart.ts
+++ b/src/server/api/endpoints/chart.ts
@@ -6,8 +6,8 @@ export const meta = {
};
export default (params: any) => new Promise(async (res, rej) => {
- const daysRange = 90;
- const hoursRange = 24;
+ const daysRange = 30;
+ const hoursRange = 30;
const now = new Date();
const y = now.getFullYear();
@@ -65,9 +65,53 @@ export default (params: any) => new Promise(async (res, rej) => {
} else { // 隙間埋め
const mostRecent = src.find(s => s.date.getTime() < current.getTime());
if (mostRecent) {
- chart.unshift(Object.assign({}, mostRecent, {
- date: current
- }));
+ chart.unshift({
+ date: current,
+ users: {
+ local: {
+ total: mostRecent.users.local.total,
+ diff: 0
+ },
+ remote: {
+ total: mostRecent.users.remote.total,
+ diff: 0
+ }
+ },
+ notes: {
+ local: {
+ total: mostRecent.notes.local.total,
+ diff: 0,
+ diffs: {
+ normal: 0,
+ reply: 0,
+ renote: 0
+ }
+ },
+ remote: {
+ total: mostRecent.notes.remote.total,
+ diff: 0,
+ diffs: {
+ normal: 0,
+ reply: 0,
+ renote: 0
+ }
+ }
+ },
+ drive: {
+ local: {
+ totalCount: mostRecent.drive.local.totalCount,
+ totalSize: mostRecent.drive.local.totalSize,
+ diffCount: 0,
+ diffSize: 0
+ },
+ remote: {
+ totalCount: mostRecent.drive.remote.totalCount,
+ totalSize: mostRecent.drive.remote.totalSize,
+ diffCount: 0,
+ diffSize: 0
+ }
+ }
+ });
} else {
chart.unshift({
date: current,