From ceda3dd72a5b4ebe01500d0a5e76a58699c878bc Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Sun, 3 Feb 2019 22:21:47 +0900
Subject: Create new type definition for 'escape-regexp' (#4058)

---
 src/server/api/endpoints/hashtags/search.ts | 2 +-
 src/server/api/endpoints/users/search.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/server/api/endpoints')

diff --git a/src/server/api/endpoints/hashtags/search.ts b/src/server/api/endpoints/hashtags/search.ts
index 4d753808d4..d8a2156357 100644
--- a/src/server/api/endpoints/hashtags/search.ts
+++ b/src/server/api/endpoints/hashtags/search.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import Hashtag from '../../../../models/hashtag';
 import define from '../../define';
-const escapeRegexp = require('escape-regexp');
+import * as escapeRegexp from 'escape-regexp';
 
 export const meta = {
 	desc: {
diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts
index 86b16dcbb1..b0a789c7d5 100644
--- a/src/server/api/endpoints/users/search.ts
+++ b/src/server/api/endpoints/users/search.ts
@@ -1,5 +1,5 @@
 import $ from 'cafy';
-const escapeRegexp = require('escape-regexp');
+import * as escapeRegexp from 'escape-regexp';
 import User, { pack, validateUsername, IUser } from '../../../../models/user';
 import define from '../../define';
 
-- 
cgit v1.2.3-freya


From fe13c17fcba8f3507e58adfaac181f77a63518ab Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Sun, 3 Feb 2019 23:41:05 +0900
Subject: Create type definition for 'langmap' (#4059)

* Create type definition for 'langmap'

* Follow lint
---
 src/@types/langmap.d.ts              | 10 ++++++++++
 src/server/api/endpoints/i/update.ts |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 src/@types/langmap.d.ts

(limited to 'src/server/api/endpoints')

diff --git a/src/@types/langmap.d.ts b/src/@types/langmap.d.ts
new file mode 100644
index 0000000000..a0f99028ab
--- /dev/null
+++ b/src/@types/langmap.d.ts
@@ -0,0 +1,10 @@
+declare module 'langmap' {
+	type Lang = {
+		nativeName: string;
+		englishName: string;
+	};
+
+	const langmap: { [lang: string]: Lang };
+
+	export = langmap;
+}
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 4b02e393bf..d087687a51 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -9,7 +9,7 @@ import getDriveFileUrl from '../../../../misc/get-drive-file-url';
 import { parse, parsePlain } from '../../../../mfm/parse';
 import extractEmojis from '../../../../misc/extract-emojis';
 import extractHashtags from '../../../../misc/extract-hashtags';
-const langmap = require('langmap');
+import * as langmap from 'langmap';
 
 export const meta = {
 	desc: {
-- 
cgit v1.2.3-freya