summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAcid Chicken (硫酸鶏) <root@acid-chicken.com>2019-02-02 00:16:27 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-02-02 00:16:27 +0900
commitda1a238be3b6ae3f870d266ca7b8ae1ad888838d (patch)
tree36c840c6d59508acd73a518430b0bb2f638e59e1 /src
parentFix #3871 (#4082) (diff)
downloadsharkey-da1a238be3b6ae3f870d266ca7b8ae1ad888838d.tar.gz
sharkey-da1a238be3b6ae3f870d266ca7b8ae1ad888838d.tar.bz2
sharkey-da1a238be3b6ae3f870d266ca7b8ae1ad888838d.zip
Create new type definition for 'ms' (#4057)
* Create new type definition for 'ms' * Follow lint
Diffstat (limited to 'src')
-rw-r--r--src/@types/ms.d.ts12
-rw-r--r--src/server/api/endpoints/blocking/create.ts2
-rw-r--r--src/server/api/endpoints/blocking/delete.ts2
-rw-r--r--src/server/api/endpoints/drive/files/create.ts2
-rw-r--r--src/server/api/endpoints/drive/files/upload_from_url.ts2
-rw-r--r--src/server/api/endpoints/following/create.ts2
-rw-r--r--src/server/api/endpoints/following/delete.ts2
-rw-r--r--src/server/api/endpoints/i/update_email.ts2
-rw-r--r--src/server/api/endpoints/messaging/messages/delete.ts2
-rw-r--r--src/server/api/endpoints/notes/create.ts2
-rw-r--r--src/server/api/endpoints/notes/delete.ts2
-rw-r--r--src/server/api/endpoints/notes/reactions/delete.ts2
-rw-r--r--src/server/api/endpoints/users/recommendation.ts2
13 files changed, 24 insertions, 12 deletions
diff --git a/src/@types/ms.d.ts b/src/@types/ms.d.ts
new file mode 100644
index 0000000000..2f0156d104
--- /dev/null
+++ b/src/@types/ms.d.ts
@@ -0,0 +1,12 @@
+declare module 'ms' {
+ interface IMSOptions {
+ long: boolean;
+ }
+
+ function ms(value: string): number;
+ function ms(value: number, options?: IMSOptions): string;
+
+ namespace ms {} // Hack
+
+ export = ms;
+}
diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts
index 7166505309..76cec064ed 100644
--- a/src/server/api/endpoints/blocking/create.ts
+++ b/src/server/api/endpoints/blocking/create.ts
@@ -1,5 +1,5 @@
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
-const ms = require('ms');
+import * as ms from 'ms';
import User, { pack } from '../../../../models/user';
import Blocking from '../../../../models/blocking';
import create from '../../../../services/blocking/create';
diff --git a/src/server/api/endpoints/blocking/delete.ts b/src/server/api/endpoints/blocking/delete.ts
index 667255a66b..86360bfb35 100644
--- a/src/server/api/endpoints/blocking/delete.ts
+++ b/src/server/api/endpoints/blocking/delete.ts
@@ -1,5 +1,5 @@
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
-const ms = require('ms');
+import * as ms from 'ms';
import User, { pack } from '../../../../models/user';
import Blocking from '../../../../models/blocking';
import deleteBlocking from '../../../../services/blocking/delete';
diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts
index 0660627f08..ce93202991 100644
--- a/src/server/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
@@ -1,4 +1,4 @@
-const ms = require('ms');
+import * as ms from 'ms';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import { validateFileName, pack } from '../../../../../models/drive-file';
import create from '../../../../../services/drive/add-file';
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 fc386e1638..bea61dbeb1 100644
--- a/src/server/api/endpoints/drive/files/upload_from_url.ts
+++ b/src/server/api/endpoints/drive/files/upload_from_url.ts
@@ -1,5 +1,5 @@
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
-const ms = require('ms');
+import * as ms from 'ms';
import { pack } from '../../../../../models/drive-file';
import uploadFromUrl from '../../../../../services/drive/upload-from-url';
import define from '../../../define';
diff --git a/src/server/api/endpoints/following/create.ts b/src/server/api/endpoints/following/create.ts
index f826776892..9786d19907 100644
--- a/src/server/api/endpoints/following/create.ts
+++ b/src/server/api/endpoints/following/create.ts
@@ -1,5 +1,5 @@
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
-const ms = require('ms');
+import * as ms from 'ms';
import User, { pack } from '../../../../models/user';
import Following from '../../../../models/following';
import create from '../../../../services/following/create';
diff --git a/src/server/api/endpoints/following/delete.ts b/src/server/api/endpoints/following/delete.ts
index 92a50ce722..c7f1288ad6 100644
--- a/src/server/api/endpoints/following/delete.ts
+++ b/src/server/api/endpoints/following/delete.ts
@@ -1,5 +1,5 @@
import $ from 'cafy'; import ID, { transform } from '../../../../misc/cafy-id';
-const ms = require('ms');
+import * as ms from 'ms';
import User, { pack } from '../../../../models/user';
import Following from '../../../../models/following';
import deleteFollowing from '../../../../services/following/delete';
diff --git a/src/server/api/endpoints/i/update_email.ts b/src/server/api/endpoints/i/update_email.ts
index e08d1fba05..aeaa3d39e4 100644
--- a/src/server/api/endpoints/i/update_email.ts
+++ b/src/server/api/endpoints/i/update_email.ts
@@ -6,7 +6,7 @@ import * as nodemailer from 'nodemailer';
import fetchMeta from '../../../../misc/fetch-meta';
import rndstr from 'rndstr';
import config from '../../../../config';
-const ms = require('ms');
+import * as ms from 'ms';
import * as bcrypt from 'bcryptjs';
export const meta = {
diff --git a/src/server/api/endpoints/messaging/messages/delete.ts b/src/server/api/endpoints/messaging/messages/delete.ts
index 26161896ce..103b680da8 100644
--- a/src/server/api/endpoints/messaging/messages/delete.ts
+++ b/src/server/api/endpoints/messaging/messages/delete.ts
@@ -3,7 +3,7 @@ import ID, { transform } from '../../../../../misc/cafy-id';
import Message from '../../../../../models/messaging-message';
import define from '../../../define';
import { publishMessagingStream } from '../../../../../stream';
-const ms = require('ms');
+import * as ms from 'ms';
export const meta = {
stability: 'stable',
diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts
index ec84d64975..696a27afb4 100644
--- a/src/server/api/endpoints/notes/create.ts
+++ b/src/server/api/endpoints/notes/create.ts
@@ -1,5 +1,5 @@
import $ from 'cafy'; import ID, { transform, transformMany } from '../../../../misc/cafy-id';
-const ms = require('ms');
+import * as ms from 'ms';
import { length } from 'stringz';
import Note, { INote, isValidCw, pack } from '../../../../models/note';
import User, { IUser } from '../../../../models/user';
diff --git a/src/server/api/endpoints/notes/delete.ts b/src/server/api/endpoints/notes/delete.ts
index 1923aed9ba..0ddcb7c443 100644
--- a/src/server/api/endpoints/notes/delete.ts
+++ b/src/server/api/endpoints/notes/delete.ts
@@ -3,7 +3,7 @@ import Note from '../../../../models/note';
import deleteNote from '../../../../services/note/delete';
import User from '../../../../models/user';
import define from '../../define';
-const ms = require('ms');
+import * as ms from 'ms';
export const meta = {
stability: 'stable',
diff --git a/src/server/api/endpoints/notes/reactions/delete.ts b/src/server/api/endpoints/notes/reactions/delete.ts
index 9ff4edb7f5..01151ef9b0 100644
--- a/src/server/api/endpoints/notes/reactions/delete.ts
+++ b/src/server/api/endpoints/notes/reactions/delete.ts
@@ -1,7 +1,7 @@
import * as mongo from 'mongodb';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import define from '../../../define';
-const ms = require('ms');
+import * as ms from 'ms';
import deleteReaction from '../../../../../services/note/reaction/delete';
import { IUser } from '../../../../../models/user';
import { getValiedNote } from '../../../common/getters';
diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
index 8320c2bd01..0d7e57b529 100644
--- a/src/server/api/endpoints/users/recommendation.ts
+++ b/src/server/api/endpoints/users/recommendation.ts
@@ -1,4 +1,4 @@
-const ms = require('ms');
+import * as ms from 'ms';
import $ from 'cafy';
import User, { pack, ILocalUser } from '../../../../models/user';
import { getFriendIds } from '../../common/get-friends';