summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-06-18 14:28:43 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-06-18 14:28:43 +0900
commite66d7babc5ae477d7a60628e5599f9c390426c81 (patch)
tree84733fc7b2a158e6d5786ccd72a58e40c301f140 /src/server
parentwip (diff)
downloadsharkey-e66d7babc5ae477d7a60628e5599f9c390426c81.tar.gz
sharkey-e66d7babc5ae477d7a60628e5599f9c390426c81.tar.bz2
sharkey-e66d7babc5ae477d7a60628e5599f9c390426c81.zip
yatta
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/endpoints/aggregation/posts.ts10
-rw-r--r--src/server/api/endpoints/drive/files/upload_from_url.ts3
-rw-r--r--src/server/api/endpoints/drive/folders.ts6
3 files changed, 9 insertions, 10 deletions
diff --git a/src/server/api/endpoints/aggregation/posts.ts b/src/server/api/endpoints/aggregation/posts.ts
index 9ada9cd3f5..48e344312d 100644
--- a/src/server/api/endpoints/aggregation/posts.ts
+++ b/src/server/api/endpoints/aggregation/posts.ts
@@ -49,13 +49,13 @@ module.exports = (params: any) => new Promise(async (res, rej) => {
} }
]);
- datas.forEach(data => {
+ datas.forEach((data: any) => {
data.date = data._id;
delete data._id;
- data.notes = (data.data.filter(x => x.type == 'note')[0] || { count: 0 }).count;
- data.renotes = (data.data.filter(x => x.type == 'renote')[0] || { count: 0 }).count;
- data.replies = (data.data.filter(x => x.type == 'reply')[0] || { count: 0 }).count;
+ data.notes = (data.data.filter((x: any) => x.type == 'note')[0] || { count: 0 }).count;
+ data.renotes = (data.data.filter((x: any) => x.type == 'renote')[0] || { count: 0 }).count;
+ data.replies = (data.data.filter((x: any) => x.type == 'reply')[0] || { count: 0 }).count;
delete data.data;
});
@@ -65,7 +65,7 @@ module.exports = (params: any) => new Promise(async (res, rej) => {
for (let i = 0; i < limit; i++) {
const day = new Date(new Date().setDate(new Date().getDate() - i));
- const data = datas.filter(d =>
+ const data = datas.filter((d: any) =>
d.date.year == day.getFullYear() && d.date.month == day.getMonth() + 1 && d.date.day == day.getDate()
)[0];
diff --git a/src/server/api/endpoints/drive/files/upload_from_url.ts b/src/server/api/endpoints/drive/files/upload_from_url.ts
index c012f0d3c9..cb617d851f 100644
--- a/src/server/api/endpoints/drive/files/upload_from_url.ts
+++ b/src/server/api/endpoints/drive/files/upload_from_url.ts
@@ -4,11 +4,12 @@
import $ from 'cafy'; import ID from '../../../../../cafy-id';
import { pack } from '../../../../../models/drive-file';
import uploadFromUrl from '../../../../../services/drive/upload-from-url';
+import { ILocalUser } from '../../../../../models/user';
/**
* Create a file from a URL
*/
-module.exports = async (params, user): Promise<any> => {
+module.exports = async (params: any, user: ILocalUser): Promise<any> => {
// Get 'url' parameter
// TODO: Validate this url
const [url, urlErr] = $.str.get(params.url);
diff --git a/src/server/api/endpoints/drive/folders.ts b/src/server/api/endpoints/drive/folders.ts
index fac9780325..3413778950 100644
--- a/src/server/api/endpoints/drive/folders.ts
+++ b/src/server/api/endpoints/drive/folders.ts
@@ -1,13 +1,11 @@
-/**
- * Module dependencies
- */
import $ from 'cafy'; import ID from '../../../../cafy-id';
import DriveFolder, { pack } from '../../../../models/drive-folder';
+import { ILocalUser } from '../../../../models/user';
/**
* Get drive folders
*/
-module.exports = (params: any, user: ILocalUser, app: IApp) => new Promise(async (res, rej) => {
+module.exports = (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
// Get 'limit' parameter
const [limit = 10, limitErr] = $.num.optional().range(1, 100).get(params.limit);
if (limitErr) return rej('invalid limit param');