From e3b3f8fac14fb4c4d150fb31c11ead1a193a36e0 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 14 Apr 2019 04:17:24 +0900
Subject: Better error handling

---
 src/services/drive/add-file.ts    | 4 ++--
 src/services/i/pin.ts             | 2 +-
 src/services/i/update.ts          | 2 +-
 src/services/note/create.ts       | 6 +++---
 src/services/note/polls/update.ts | 4 ++--
 src/services/note/polls/vote.ts   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/services')

diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 94b97fed61..9eccfb125c 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -297,7 +297,7 @@ export default async function(
 		// If usage limit exceeded
 		if (usage + size > driveCapacity) {
 			if (Users.isLocalUser(user)) {
-				throw 'no-free-space';
+				throw new Error('no-free-space');
 			} else {
 				// (アバターまたはバナーを含まず)最も古いファイルを削除する
 				deleteOldFile(user as IRemoteUser);
@@ -316,7 +316,7 @@ export default async function(
 			userId: user.id
 		});
 
-		if (driveFolder == null) throw 'folder-not-found';
+		if (driveFolder == null) throw new Error('folder-not-found');
 
 		return driveFolder;
 	};
diff --git a/src/services/i/pin.ts b/src/services/i/pin.ts
index f5c957c742..a6d2dfcdbf 100644
--- a/src/services/i/pin.ts
+++ b/src/services/i/pin.ts
@@ -78,7 +78,7 @@ export async function removePinned(user: User, noteId: Note['id']) {
 
 export async function deliverPinnedChange(userId: User['id'], noteId: Note['id'], isAddition: boolean) {
 	const user = await Users.findOne(userId);
-	if (user == null) throw 'user not found';
+	if (user == null) throw new Error('user not found');
 
 	if (!Users.isLocalUser(user)) return;
 
diff --git a/src/services/i/update.ts b/src/services/i/update.ts
index 2bb5c7a100..ddb6704a03 100644
--- a/src/services/i/update.ts
+++ b/src/services/i/update.ts
@@ -7,7 +7,7 @@ import { renderPerson } from '../../remote/activitypub/renderer/person';
 
 export async function publishToFollowers(userId: User['id']) {
 	const user = await Users.findOne(userId);
-	if (user == null) throw 'user not found';
+	if (user == null) throw new Error('user not found');
 
 	const followers = await Followings.find({
 		followeeId: user.id
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 9c5989696a..8c85a5c275 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -175,7 +175,7 @@ export default async (user: User, data: Option, silent = false) => new Promise<N
 	}
 
 	if (data.visibility == 'specified') {
-		if (data.visibleUsers == null) throw 'invalid param';
+		if (data.visibleUsers == null) throw new Error('invalid param');
 
 		for (const u of data.visibleUsers) {
 			if (!mentionedUsers.some(x => x.id === u.id)) {
@@ -214,7 +214,7 @@ export default async (user: User, data: Option, silent = false) => new Promise<N
 
 	// 未読通知を作成
 	if (data.visibility == 'specified') {
-		if (data.visibleUsers == null) throw 'invalid param';
+		if (data.visibleUsers == null) throw new Error('invalid param');
 
 		for (const u of data.visibleUsers) {
 			insertNoteUnread(u, note, true);
@@ -428,7 +428,7 @@ async function insertNote(user: User, data: Option, tags: string[], emojis: stri
 
 		console.error(e);
 
-		throw 'something happened';
+		throw new Error('something happened');
 	}
 }
 
diff --git a/src/services/note/polls/update.ts b/src/services/note/polls/update.ts
index 277ace204d..f979ef2f0a 100644
--- a/src/services/note/polls/update.ts
+++ b/src/services/note/polls/update.ts
@@ -7,10 +7,10 @@ import { Note } from '../../../models/entities/note';
 
 export async function deliverQuestionUpdate(noteId: Note['id']) {
 	const note = await Notes.findOne(noteId);
-	if (note == null) throw 'note not found';
+	if (note == null) throw new Error('note not found');
 
 	const user = await Users.findOne(note.userId);
-	if (user == null) throw 'note not found';
+	if (user == null) throw new Error('note not found');
 
 	const followers = await Followings.find({
 		followeeId: user.id
diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts
index 0955e4f80d..c6876484f5 100644
--- a/src/services/note/polls/vote.ts
+++ b/src/services/note/polls/vote.ts
@@ -10,7 +10,7 @@ import { createNotification } from '../../create-notification';
 export default async function(user: User, note: Note, choice: number) {
 	const poll = await Polls.findOne(note.id);
 
-	if (poll == null) throw 'poll not found';
+	if (poll == null) throw new Error('poll not found');
 
 	// Check whether is valid choice
 	if (poll.choices[choice] == null) throw new Error('invalid choice param');
-- 
cgit v1.2.3-freya