Refactor

9 files changed, 18 insertions, 18 deletions

diff --git a/src/server/api/endpoints/notes/conversation.ts b/src/server/api/endpoints/notes/conversation.ts
index ec371ecf19..2f08de9e8f 100644
--- a/src/server/api/endpoints/notes/conversation.ts
+++ b/src/server/api/endpoints/notes/conversation.ts
@@ -3,7 +3,7 @@ import ID, { transform } from '../../../../misc/cafy-id';
 import Note, { packMany, INote } from '../../../../models/note';
 import define from '../../define';
 import { ApiError } from '../../error';
-import { getValiedNote } from '../../common/getters';
+import { getNote } from '../../common/getters';
 
 export const meta = {
 	desc: {
@@ -44,7 +44,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const note = await getValiedNote(ps.noteId).catch(e => {
+	const note = await getNote(ps.noteId).catch(e => {
 		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 		throw e;
 	});
diff --git a/src/server/api/endpoints/notes/delete.ts b/src/server/api/endpoints/notes/delete.ts
index 42f7494184..8ca5a3bb08 100644
--- a/src/server/api/endpoints/notes/delete.ts
+++ b/src/server/api/endpoints/notes/delete.ts
@@ -4,7 +4,7 @@ import deleteNote from '../../../../services/note/delete';
 import User from '../../../../models/user';
 import define from '../../define';
 import * as ms from 'ms';
-import { getValiedNote } from '../../common/getters';
+import { getNote } from '../../common/getters';
 import { ApiError } from '../../error';
 
 export const meta = {
@@ -52,7 +52,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const note = await getValiedNote(ps.noteId).catch(e => {
+	const note = await getNote(ps.noteId).catch(e => {
 		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 		throw e;
 	});
diff --git a/src/server/api/endpoints/notes/reactions.ts b/src/server/api/endpoints/notes/reactions.ts
index 3e0656c4f8..74f22cc774 100644
--- a/src/server/api/endpoints/notes/reactions.ts
+++ b/src/server/api/endpoints/notes/reactions.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import ID, { transform } from '../../../../misc/cafy-id';
 import Reaction, { pack } from '../../../../models/note-reaction';
 import define from '../../define';
-import { getValiedNote } from '../../common/getters';
+import { getNote } from '../../common/getters';
 import { ApiError } from '../../error';
 
 export const meta = {
@@ -54,7 +54,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const note = await getValiedNote(ps.noteId).catch(e => {
+	const note = await getNote(ps.noteId).catch(e => {
 		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 		throw e;
 	});
diff --git a/src/server/api/endpoints/notes/reactions/create.ts b/src/server/api/endpoints/notes/reactions/create.ts
index 65232e231d..816c6a9c29 100644
--- a/src/server/api/endpoints/notes/reactions/create.ts
+++ b/src/server/api/endpoints/notes/reactions/create.ts
@@ -3,7 +3,7 @@ import ID, { transform } from '../../../../../misc/cafy-id';
 import createReaction from '../../../../../services/note/reaction/create';
 import { validateReaction } from '../../../../../models/note-reaction';
 import define from '../../../define';
-import { getValiedNote } from '../../../common/getters';
+import { getNote } from '../../../common/getters';
 import { ApiError } from '../../../error';
 
 export const meta = {
@@ -57,7 +57,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const note = await getValiedNote(ps.noteId).catch(e => {
+	const note = await getNote(ps.noteId).catch(e => {
 		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 		throw e;
 	});
diff --git a/src/server/api/endpoints/notes/reactions/delete.ts b/src/server/api/endpoints/notes/reactions/delete.ts
index 47e98f63e4..1afa6526f5 100644
--- a/src/server/api/endpoints/notes/reactions/delete.ts
+++ b/src/server/api/endpoints/notes/reactions/delete.ts
@@ -3,7 +3,7 @@ import ID, { transform } from '../../../../../misc/cafy-id';
 import define from '../../../define';
 import * as ms from 'ms';
 import deleteReaction from '../../../../../services/note/reaction/delete';
-import { getValiedNote } from '../../../common/getters';
+import { getNote } from '../../../common/getters';
 import { ApiError } from '../../../error';
 
 export const meta = {
@@ -49,7 +49,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const note = await getValiedNote(ps.noteId).catch(e => {
+	const note = await getNote(ps.noteId).catch(e => {
 		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 		throw e;
 	});
diff --git a/src/server/api/endpoints/notes/renotes.ts b/src/server/api/endpoints/notes/renotes.ts
index 9873f1bffa..b4c99b1f4e 100644
--- a/src/server/api/endpoints/notes/renotes.ts
+++ b/src/server/api/endpoints/notes/renotes.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import ID, { transform } from '../../../../misc/cafy-id';
 import Note, { packMany } from '../../../../models/note';
 import define from '../../define';
-import { getValiedNote } from '../../common/getters';
+import { getNote } from '../../common/getters';
 import { ApiError } from '../../error';
 
 export const meta = {
@@ -49,7 +49,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const note = await getValiedNote(ps.noteId).catch(e => {
+	const note = await getNote(ps.noteId).catch(e => {
 		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 		throw e;
 	});
diff --git a/src/server/api/endpoints/notes/show.ts b/src/server/api/endpoints/notes/show.ts
index 2134fad953..f4fd06c03d 100644
--- a/src/server/api/endpoints/notes/show.ts
+++ b/src/server/api/endpoints/notes/show.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import ID, { transform } from '../../../../misc/cafy-id';
 import { pack } from '../../../../models/note';
 import define from '../../define';
-import { getValiedNote } from '../../common/getters';
+import { getNote } from '../../common/getters';
 import { ApiError } from '../../error';
 
 export const meta = {
@@ -36,7 +36,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const note = await getValiedNote(ps.noteId).catch(e => {
+	const note = await getNote(ps.noteId).catch(e => {
 		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 		throw e;
 	});
diff --git a/src/server/api/endpoints/notes/watching/create.ts b/src/server/api/endpoints/notes/watching/create.ts
index ebba211fc0..7361237e8d 100644
--- a/src/server/api/endpoints/notes/watching/create.ts
+++ b/src/server/api/endpoints/notes/watching/create.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import ID, { transform } from '../../../../../misc/cafy-id';
 import define from '../../../define';
 import watch from '../../../../../services/note/watch';
-import { getValiedNote } from '../../../common/getters';
+import { getNote } from '../../../common/getters';
 import { ApiError } from '../../../error';
 
 export const meta = {
@@ -38,7 +38,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const note = await getValiedNote(ps.noteId).catch(e => {
+	const note = await getNote(ps.noteId).catch(e => {
 		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 		throw e;
 	});
diff --git a/src/server/api/endpoints/notes/watching/delete.ts b/src/server/api/endpoints/notes/watching/delete.ts
index 63354d4ab2..33fbef570c 100644
--- a/src/server/api/endpoints/notes/watching/delete.ts
+++ b/src/server/api/endpoints/notes/watching/delete.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
 import ID, { transform } from '../../../../../misc/cafy-id';
 import define from '../../../define';
 import unwatch from '../../../../../services/note/unwatch';
-import { getValiedNote } from '../../../common/getters';
+import { getNote } from '../../../common/getters';
 import { ApiError } from '../../../error';
 
 export const meta = {
@@ -38,7 +38,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const note = await getValiedNote(ps.noteId).catch(e => {
+	const note = await getNote(ps.noteId).catch(e => {
 		if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
 		throw e;
 	});