From 8ecfb3919abc578ea9fe2d242292c5093f2752b9 Mon Sep 17 00:00:00 2001
From: Yasuaki Uechi <y@uechi.io>
Date: Tue, 10 Dec 2019 18:33:39 +0900
Subject: [PATCH] chore: capitalize error message

---
 api/services/appstore.ts  |  2 +-
 api/services/debian.ts    |  6 +++++-
 api/services/dns.ts       |  4 ++--
 api/services/domain.ts    |  5 ++++-
 api/services/existence.ts |  6 +++++-
 api/services/gitlab.ts    | 16 +++++++---------
 api/services/launchpad.ts |  6 +++++-
 api/services/npm-org.ts   |  5 ++++-
 api/services/npm.ts       |  2 +-
 api/services/nta.ts       |  2 +-
 api/services/slack.ts     | 12 ++++++------
 api/services/spectrum.ts  |  6 +++++-
 12 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/api/services/appstore.ts b/api/services/appstore.ts
index b2f68b1..f3d53f7 100644
--- a/api/services/appstore.ts
+++ b/api/services/appstore.ts
@@ -20,7 +20,7 @@ export default async function handler(
   const {query, country} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
   }
 
   const term = encodeURIComponent(query);
diff --git a/api/services/debian.ts b/api/services/debian.ts
index fad493e..0b7bde5 100644
--- a/api/services/debian.ts
+++ b/api/services/debian.ts
@@ -4,7 +4,11 @@ export default async function handler(req: NowRequest, res: NowResponse) {
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
+  }
+
+  if (/[^a-zA-Z0-9_-]/.test(query)) {
+    return sendError(res, new Error('Invalid characters'));
   }
 
   try {
diff --git a/api/services/dns.ts b/api/services/dns.ts
index f26e730..85c1385 100644
--- a/api/services/dns.ts
+++ b/api/services/dns.ts
@@ -14,7 +14,7 @@ export default async function handler(req: NowRequest, res: NowResponse) {
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
   }
 
   try {
@@ -23,7 +23,7 @@ export default async function handler(req: NowRequest, res: NowResponse) {
     send(res, {availability});
   } catch (err) {
     if (err.code === 'ENODATA' || err.code === 'ENOTFOUND') {
-      return res.status(200).json({availability: true});
+      return send(res, {availability: true});
     }
     sendError(res, err);
   }
diff --git a/api/services/domain.ts b/api/services/domain.ts
index 694131a..4b4a2e2 100644
--- a/api/services/domain.ts
+++ b/api/services/domain.ts
@@ -5,7 +5,7 @@ export default async function handler(req: NowRequest, res: NowResponse) {
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
   }
 
   try {
@@ -13,6 +13,9 @@ export default async function handler(req: NowRequest, res: NowResponse) {
     const availability = response[0].data.domainName ? false : true;
     send(res, {availability});
   } catch (err) {
+    if (err.code === 'ENOTFOUND') {
+      return send(res, {availability: true});
+    }
     sendError(res, err);
   }
 }
diff --git a/api/services/existence.ts b/api/services/existence.ts
index 35bc8df..0273e44 100644
--- a/api/services/existence.ts
+++ b/api/services/existence.ts
@@ -12,7 +12,7 @@ export default async function handler(req: NowRequest, res: NowResponse) {
       query,
     )
   ) {
-    return sendError(res, new Error('invalid characters'));
+    return sendError(res, new Error('Invalid characters'));
   }
 
   try {
@@ -20,6 +20,10 @@ export default async function handler(req: NowRequest, res: NowResponse) {
     const availability = response.status === 404;
     send(res, {availability});
   } catch (err) {
+    console.log(err.code);
+    if (err.code === 'ENOTFOUND') {
+      return send(res, {availability: true});
+    }
     sendError(res, err);
   }
 }
diff --git a/api/services/gitlab.ts b/api/services/gitlab.ts
index 34749a3..d5af2ec 100644
--- a/api/services/gitlab.ts
+++ b/api/services/gitlab.ts
@@ -1,23 +1,21 @@
 import {send, sendError, fetch, NowRequest, NowResponse} from '../util/http';
-import nodeFetch from 'node-fetch'
+import nodeFetch from 'node-fetch';
 
 export default async function handler(req: NowRequest, res: NowResponse) {
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
   }
 
-  if (
-    /[^\w-]/.test(
-      query,
-    )
-  ) {
-    return sendError(res, new Error('invalid characters'));
+  if (/[^a-zA-Z0-9_-]/.test(query)) {
+    return sendError(res, new Error('Invalid characters'));
   }
 
   try {
-    const response = await nodeFetch(`https://gitlab.com/${query}`, {redirect: 'manual'});
+    const response = await nodeFetch(`https://gitlab.com/${query}`, {
+      redirect: 'manual',
+    });
     const availability = response.status === 302;
     send(res, {availability});
   } catch (err) {
diff --git a/api/services/launchpad.ts b/api/services/launchpad.ts
index f7c7a8f..846dc35 100644
--- a/api/services/launchpad.ts
+++ b/api/services/launchpad.ts
@@ -4,7 +4,11 @@ export default async function handler(req: NowRequest, res: NowResponse) {
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
+  }
+
+  if (/[^a-zA-Z0-9_-]/.test(query)) {
+    return sendError(res, new Error('Invalid characters'));
   }
 
   try {
diff --git a/api/services/npm-org.ts b/api/services/npm-org.ts
index 8d32ce7..44e0a8d 100644
--- a/api/services/npm-org.ts
+++ b/api/services/npm-org.ts
@@ -5,13 +5,16 @@ export default async function handler(req: NowRequest, res: NowResponse) {
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
   }
 
   try {
     const availability = await npmName(`@${query}`);
     send(res, {availability});
   } catch (err) {
+    if (err.code === 'ENOTFOUND') {
+      return send(res, {availability: true});
+    }
     sendError(res, err);
   }
 }
diff --git a/api/services/npm.ts b/api/services/npm.ts
index f88ce5d..1b795ff 100644
--- a/api/services/npm.ts
+++ b/api/services/npm.ts
@@ -5,7 +5,7 @@ export default async function handler(req: NowRequest, res: NowResponse) {
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
   }
 
   try {
diff --git a/api/services/nta.ts b/api/services/nta.ts
index 46cd5e5..e4b3bed 100644
--- a/api/services/nta.ts
+++ b/api/services/nta.ts
@@ -9,7 +9,7 @@ export default async function handler(
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
   }
 
   const encodedQuery = encodeURIComponent(
diff --git a/api/services/slack.ts b/api/services/slack.ts
index a6de408..e9d5d9b 100644
--- a/api/services/slack.ts
+++ b/api/services/slack.ts
@@ -4,7 +4,11 @@ export default async function handler(req: NowRequest, res: NowResponse) {
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
+  }
+
+  if (/[^a-zA-Z0-9_-]/.test(query)) {
+    return sendError(res, new Error('Invalid characters'));
   }
 
   try {
@@ -14,10 +18,6 @@ export default async function handler(req: NowRequest, res: NowResponse) {
     const availability = response.status !== 200;
     send(res, {availability});
   } catch (err) {
-    if (err.code === 'ENOTFOUND') {
-      send(res, {availability: true});
-    } else {
-      sendError(res, err);
-    }
+    sendError(res, err);
   }
 }
diff --git a/api/services/spectrum.ts b/api/services/spectrum.ts
index c275e05..5b44ed8 100644
--- a/api/services/spectrum.ts
+++ b/api/services/spectrum.ts
@@ -4,7 +4,11 @@ export default async function handler(req: NowRequest, res: NowResponse) {
   const {query} = req.query;
 
   if (!query) {
-    return sendError(res, new Error('no query given'));
+    return sendError(res, new Error('No query given'));
+  }
+
+  if (/[^a-zA-Z0-9_-]/.test(query)) {
+    return sendError(res, new Error('Invalid characters'));
   }
 
   try {