From 9b876b30b27d6a02129447f6584d95a497d94c32 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 12 Nov 2021 19:47:04 +0900
Subject: [PATCH] update ms to 3.0.0

---
 packages/backend/@types/ms.d.ts                      | 12 ------------
 packages/backend/package.json                        |  2 +-
 packages/backend/src/server/api/endpoints/ap/get.ts  |  2 +-
 packages/backend/src/server/api/endpoints/ap/show.ts |  2 +-
 .../src/server/api/endpoints/blocking/create.ts      |  2 +-
 .../src/server/api/endpoints/blocking/delete.ts      |  2 +-
 .../src/server/api/endpoints/drive/files/create.ts   |  2 +-
 .../api/endpoints/drive/files/upload-from-url.ts     |  2 +-
 .../src/server/api/endpoints/following/create.ts     |  2 +-
 .../src/server/api/endpoints/following/delete.ts     |  2 +-
 .../src/server/api/endpoints/gallery/posts/create.ts |  2 +-
 .../src/server/api/endpoints/gallery/posts/update.ts |  2 +-
 .../src/server/api/endpoints/i/export-blocking.ts    |  2 +-
 .../src/server/api/endpoints/i/export-following.ts   |  2 +-
 .../src/server/api/endpoints/i/export-mute.ts        |  2 +-
 .../src/server/api/endpoints/i/export-notes.ts       |  2 +-
 .../src/server/api/endpoints/i/export-user-lists.ts  |  2 +-
 .../src/server/api/endpoints/i/import-blocking.ts    |  2 +-
 .../src/server/api/endpoints/i/import-following.ts   |  2 +-
 .../src/server/api/endpoints/i/import-muting.ts      |  2 +-
 .../src/server/api/endpoints/i/import-user-lists.ts  |  2 +-
 .../src/server/api/endpoints/i/update-email.ts       |  2 +-
 .../api/endpoints/messaging/messages/delete.ts       |  2 +-
 .../backend/src/server/api/endpoints/notes/create.ts |  2 +-
 .../backend/src/server/api/endpoints/notes/delete.ts |  2 +-
 .../server/api/endpoints/notes/reactions/delete.ts   |  2 +-
 .../src/server/api/endpoints/notes/unrenote.ts       |  2 +-
 .../backend/src/server/api/endpoints/pages/create.ts |  2 +-
 .../backend/src/server/api/endpoints/pages/update.ts |  2 +-
 .../server/api/endpoints/request-reset-password.ts   |  2 +-
 .../src/server/api/endpoints/users/recommendation.ts |  2 +-
 packages/backend/src/server/web/index.ts             |  2 +-
 packages/backend/yarn.lock                           |  5 +++++
 33 files changed, 36 insertions(+), 43 deletions(-)
 delete mode 100644 packages/backend/@types/ms.d.ts

diff --git a/packages/backend/@types/ms.d.ts b/packages/backend/@types/ms.d.ts
deleted file mode 100644
index 2f0156d104..0000000000
--- a/packages/backend/@types/ms.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-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/packages/backend/package.json b/packages/backend/package.json
index 4376dc4887..b1337489fa 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -135,7 +135,7 @@
 		"mfm-js": "0.20.0",
 		"misskey-js": "0.0.8",
 		"mocha": "8.4.0",
-		"ms": "2.1.3",
+		"ms": "3.0.0-canary.1",
 		"multer": "1.4.3",
 		"nested-property": "4.0.0",
 		"node-fetch": "2.6.1",
diff --git a/packages/backend/src/server/api/endpoints/ap/get.ts b/packages/backend/src/server/api/endpoints/ap/get.ts
index 78919f43b0..2f97a24774 100644
--- a/packages/backend/src/server/api/endpoints/ap/get.ts
+++ b/packages/backend/src/server/api/endpoints/ap/get.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import define from '../../define';
 import Resolver from '@/remote/activitypub/resolver';
 import { ApiError } from '../../error';
-import * as ms from 'ms';
+import ms from 'ms';
 
 export const meta = {
 	tags: ['federation'],
diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
index 2280d93724..32685d44bd 100644
--- a/packages/backend/src/server/api/endpoints/ap/show.ts
+++ b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -11,7 +11,7 @@ import { Note } from '@/models/entities/note';
 import { User } from '@/models/entities/user';
 import { fetchMeta } from '@/misc/fetch-meta';
 import { isActor, isPost, getApId } from '@/remote/activitypub/type';
-import * as ms from 'ms';
+import ms from 'ms';
 
 export const meta = {
 	tags: ['federation'],
diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts
index 2953252394..4d33c09479 100644
--- a/packages/backend/src/server/api/endpoints/blocking/create.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/create.ts
@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
-import * as ms from 'ms';
+import ms from 'ms';
 import create from '@/services/blocking/create';
 import define from '../../define';
 import { ApiError } from '../../error';
diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts
index a66e46fdf0..ae5dab020a 100644
--- a/packages/backend/src/server/api/endpoints/blocking/delete.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts
@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
-import * as ms from 'ms';
+import ms from 'ms';
 import deleteBlocking from '@/services/blocking/delete';
 import define from '../../define';
 import { ApiError } from '../../error';
diff --git a/packages/backend/src/server/api/endpoints/drive/files/create.ts b/packages/backend/src/server/api/endpoints/drive/files/create.ts
index 2abc104e6c..89755d9498 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/create.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/create.ts
@@ -1,4 +1,4 @@
-import * as ms from 'ms';
+import ms from 'ms';
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import create from '@/services/drive/add-file';
diff --git a/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts b/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts
index 9f10a42d24..adb5126fbe 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts
@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
-import * as ms from 'ms';
+import ms from 'ms';
 import uploadFromUrl from '@/services/drive/upload-from-url';
 import define from '../../../define';
 import { DriveFiles } from '@/models/index';
diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts
index ba9ca1092d..92e86bf6b2 100644
--- a/packages/backend/src/server/api/endpoints/following/create.ts
+++ b/packages/backend/src/server/api/endpoints/following/create.ts
@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
-import * as ms from 'ms';
+import ms from 'ms';
 import create from '@/services/following/create';
 import define from '../../define';
 import { ApiError } from '../../error';
diff --git a/packages/backend/src/server/api/endpoints/following/delete.ts b/packages/backend/src/server/api/endpoints/following/delete.ts
index 0b0158b86e..030d30c9b5 100644
--- a/packages/backend/src/server/api/endpoints/following/delete.ts
+++ b/packages/backend/src/server/api/endpoints/following/delete.ts
@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
-import * as ms from 'ms';
+import ms from 'ms';
 import deleteFollowing from '@/services/following/delete';
 import define from '../../define';
 import { ApiError } from '../../error';
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
index 38b487e6ea..34af72695d 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import * as ms from 'ms';
+import ms from 'ms';
 import define from '../../../define';
 import { ID } from '../../../../../misc/cafy-id';
 import { DriveFiles, GalleryPosts } from '@/models/index';
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
index 54eea130d3..f94606acf2 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import * as ms from 'ms';
+import ms from 'ms';
 import define from '../../../define';
 import { ID } from '../../../../../misc/cafy-id';
 import { DriveFiles, GalleryPosts } from '@/models/index';
diff --git a/packages/backend/src/server/api/endpoints/i/export-blocking.ts b/packages/backend/src/server/api/endpoints/i/export-blocking.ts
index e4797da0c1..e276ecf384 100644
--- a/packages/backend/src/server/api/endpoints/i/export-blocking.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-blocking.ts
@@ -1,6 +1,6 @@
 import define from '../../define';
 import { createExportBlockingJob } from '@/queue/index';
-import * as ms from 'ms';
+import ms from 'ms';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/export-following.ts b/packages/backend/src/server/api/endpoints/i/export-following.ts
index b0f154cda8..a351161111 100644
--- a/packages/backend/src/server/api/endpoints/i/export-following.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-following.ts
@@ -1,6 +1,6 @@
 import define from '../../define';
 import { createExportFollowingJob } from '@/queue/index';
-import * as ms from 'ms';
+import ms from 'ms';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/export-mute.ts b/packages/backend/src/server/api/endpoints/i/export-mute.ts
index 46d547fa53..b176c7ee8d 100644
--- a/packages/backend/src/server/api/endpoints/i/export-mute.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-mute.ts
@@ -1,6 +1,6 @@
 import define from '../../define';
 import { createExportMuteJob } from '@/queue/index';
-import * as ms from 'ms';
+import ms from 'ms';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/export-notes.ts b/packages/backend/src/server/api/endpoints/i/export-notes.ts
index 441bf16896..8cba04552e 100644
--- a/packages/backend/src/server/api/endpoints/i/export-notes.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-notes.ts
@@ -1,6 +1,6 @@
 import define from '../../define';
 import { createExportNotesJob } from '@/queue/index';
-import * as ms from 'ms';
+import ms from 'ms';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts
index 24043a862a..44d43c0bea 100644
--- a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts
@@ -1,6 +1,6 @@
 import define from '../../define';
 import { createExportUserListsJob } from '@/queue/index';
-import * as ms from 'ms';
+import ms from 'ms';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/import-blocking.ts b/packages/backend/src/server/api/endpoints/i/import-blocking.ts
index d44d0b6077..4822bd5868 100644
--- a/packages/backend/src/server/api/endpoints/i/import-blocking.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-blocking.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import define from '../../define';
 import { createImportBlockingJob } from '@/queue/index';
-import * as ms from 'ms';
+import ms from 'ms';
 import { ApiError } from '../../error';
 import { DriveFiles } from '@/models/index';
 
diff --git a/packages/backend/src/server/api/endpoints/i/import-following.ts b/packages/backend/src/server/api/endpoints/i/import-following.ts
index b3de397661..19aa2fa933 100644
--- a/packages/backend/src/server/api/endpoints/i/import-following.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-following.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import define from '../../define';
 import { createImportFollowingJob } from '@/queue/index';
-import * as ms from 'ms';
+import ms from 'ms';
 import { ApiError } from '../../error';
 import { DriveFiles } from '@/models/index';
 
diff --git a/packages/backend/src/server/api/endpoints/i/import-muting.ts b/packages/backend/src/server/api/endpoints/i/import-muting.ts
index c17434c587..c474dd7186 100644
--- a/packages/backend/src/server/api/endpoints/i/import-muting.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-muting.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import define from '../../define';
 import { createImportMutingJob } from '@/queue/index';
-import * as ms from 'ms';
+import ms from 'ms';
 import { ApiError } from '../../error';
 import { DriveFiles } from '@/models/index';
 
diff --git a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts
index 9069a019a9..ceccdd1852 100644
--- a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import define from '../../define';
 import { createImportUserListsJob } from '@/queue/index';
-import * as ms from 'ms';
+import ms from 'ms';
 import { ApiError } from '../../error';
 import { DriveFiles } from '@/models/index';
 
diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts
index 9b6fb9c410..ff5a9f292c 100644
--- a/packages/backend/src/server/api/endpoints/i/update-email.ts
+++ b/packages/backend/src/server/api/endpoints/i/update-email.ts
@@ -3,7 +3,7 @@ import { publishMainStream } from '@/services/stream';
 import define from '../../define';
 import rndstr from 'rndstr';
 import config from '@/config/index';
-import * as ms from 'ms';
+import ms from 'ms';
 import * as bcrypt from 'bcryptjs';
 import { Users, UserProfiles } from '@/models/index';
 import { sendEmail } from '@/services/send-email';
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
index bd4890fc8a..25bf676383 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import define from '../../../define';
-import * as ms from 'ms';
+import ms from 'ms';
 import { ApiError } from '../../../error';
 import { MessagingMessages } from '@/models/index';
 import { deleteMessage } from '@/services/messages/delete';
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 8257ea1d0f..e9584e7b8b 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import * as ms from 'ms';
+import ms from 'ms';
 import { length } from 'stringz';
 import create from '@/services/note/create';
 import define from '../../define';
diff --git a/packages/backend/src/server/api/endpoints/notes/delete.ts b/packages/backend/src/server/api/endpoints/notes/delete.ts
index 7163a2b9d2..7f0d59669e 100644
--- a/packages/backend/src/server/api/endpoints/notes/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/delete.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import deleteNote from '@/services/note/delete';
 import define from '../../define';
-import * as ms from 'ms';
+import ms from 'ms';
 import { getNote } from '../../common/getters';
 import { ApiError } from '../../error';
 import { Users } from '@/models/index';
diff --git a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
index 69550f96de..ea851458d2 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import define from '../../../define';
-import * as ms from 'ms';
+import ms from 'ms';
 import deleteReaction from '@/services/note/reaction/delete';
 import { getNote } from '../../../common/getters';
 import { ApiError } from '../../../error';
diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
index dce43d9d9c..d3fba66095 100644
--- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import { ID } from '@/misc/cafy-id';
 import deleteNote from '@/services/note/delete';
 import define from '../../define';
-import * as ms from 'ms';
+import ms from 'ms';
 import { getNote } from '../../common/getters';
 import { ApiError } from '../../error';
 import { Notes, Users } from '@/models/index';
diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts
index c23978f093..0ec287c592 100644
--- a/packages/backend/src/server/api/endpoints/pages/create.ts
+++ b/packages/backend/src/server/api/endpoints/pages/create.ts
@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import * as ms from 'ms';
+import ms from 'ms';
 import define from '../../define';
 import { ID } from '@/misc/cafy-id';
 import { Pages, DriveFiles } from '@/models/index';
diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts
index b3a7f26963..4aaf2aed5d 100644
--- a/packages/backend/src/server/api/endpoints/pages/update.ts
+++ b/packages/backend/src/server/api/endpoints/pages/update.ts
@@ -1,5 +1,5 @@
 import $ from 'cafy';
-import * as ms from 'ms';
+import ms from 'ms';
 import define from '../../define';
 import { ApiError } from '../../error';
 import { Pages, DriveFiles } from '@/models/index';
diff --git a/packages/backend/src/server/api/endpoints/request-reset-password.ts b/packages/backend/src/server/api/endpoints/request-reset-password.ts
index f9928c2ee6..7bb50bf6a6 100644
--- a/packages/backend/src/server/api/endpoints/request-reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/request-reset-password.ts
@@ -3,7 +3,7 @@ import { publishMainStream } from '@/services/stream';
 import define from '../define';
 import rndstr from 'rndstr';
 import config from '@/config/index';
-import * as ms from 'ms';
+import ms from 'ms';
 import { Users, UserProfiles, PasswordResetRequests } from '@/models/index';
 import { sendEmail } from '@/services/send-email';
 import { ApiError } from '../error';
diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts
index dde6bb1037..7c775c4dcf 100644
--- a/packages/backend/src/server/api/endpoints/users/recommendation.ts
+++ b/packages/backend/src/server/api/endpoints/users/recommendation.ts
@@ -1,4 +1,4 @@
-import * as ms from 'ms';
+import ms from 'ms';
 import $ from 'cafy';
 import define from '../../define';
 import { Users, Followings } from '@/models/index';
diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index fc95a36a87..d80d73f252 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -3,7 +3,7 @@
  */
 
 import { dirname } from 'path';
-import * as ms from 'ms';
+import ms from 'ms';
 import * as Koa from 'koa';
 import * as Router from '@koa/router';
 import * as send from 'koa-send';
diff --git a/packages/backend/yarn.lock b/packages/backend/yarn.lock
index 0346380ee1..311530db66 100644
--- a/packages/backend/yarn.lock
+++ b/packages/backend/yarn.lock
@@ -5421,6 +5421,11 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+ms@3.0.0-canary.1:
+  version "3.0.0-canary.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-3.0.0-canary.1.tgz#c7b34fbce381492fd0b345d1cf56e14d67b77b80"
+  integrity sha512-kh8ARjh8rMN7Du2igDRO9QJnqCb2xYTJxyQYK7vJJS4TvLLmsbyhiKpSW+t+y26gyOyMd0riphX0GeWKU3ky5g==
+
 multer@1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.3.tgz#4db352d6992e028ac0eacf7be45c6efd0264297b"