mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-09 19:43:09 +02:00
Refactor
This commit is contained in:
parent
b7d62d09ec
commit
13e43a4f74
3 changed files with 12 additions and 20 deletions
|
@ -1,9 +1,9 @@
|
|||
import $ from 'cafy';
|
||||
import ID, { transform } from '../../../../../misc/cafy-id';
|
||||
import Favorite from '../../../../../models/favorite';
|
||||
import Note from '../../../../../models/note';
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { getNote } from '../../../common/getters';
|
||||
|
||||
export const meta = {
|
||||
stability: 'stable',
|
||||
|
@ -45,14 +45,11 @@ export const meta = {
|
|||
|
||||
export default define(meta, async (ps, user) => {
|
||||
// Get favoritee
|
||||
const note = await Note.findOne({
|
||||
_id: ps.noteId
|
||||
const note = await getNote(ps.noteId).catch(e => {
|
||||
if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
|
||||
throw e;
|
||||
});
|
||||
|
||||
if (note === null) {
|
||||
throw new ApiError(meta.errors.noSuchNote);
|
||||
}
|
||||
|
||||
// if already favorited
|
||||
const exist = await Favorite.findOne({
|
||||
noteId: note._id,
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import $ from 'cafy';
|
||||
import ID, { transform } from '../../../../../misc/cafy-id';
|
||||
import Favorite from '../../../../../models/favorite';
|
||||
import Note from '../../../../../models/note';
|
||||
import define from '../../../define';
|
||||
import { ApiError } from '../../../error';
|
||||
import { getNote } from '../../../common/getters';
|
||||
|
||||
export const meta = {
|
||||
stability: 'stable',
|
||||
|
@ -45,14 +45,11 @@ export const meta = {
|
|||
|
||||
export default define(meta, async (ps, user) => {
|
||||
// Get favoritee
|
||||
const note = await Note.findOne({
|
||||
_id: ps.noteId
|
||||
const note = await getNote(ps.noteId).catch(e => {
|
||||
if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
|
||||
throw e;
|
||||
});
|
||||
|
||||
if (note === null) {
|
||||
throw new ApiError(meta.errors.noSuchNote);
|
||||
}
|
||||
|
||||
// if already favorited
|
||||
const exist = await Favorite.findOne({
|
||||
noteId: note._id,
|
||||
|
|
|
@ -10,6 +10,7 @@ import define from '../../../define';
|
|||
import createNote from '../../../../../services/note/create';
|
||||
import User from '../../../../../models/user';
|
||||
import { ApiError } from '../../../error';
|
||||
import { getNote } from '../../../common/getters';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
|
@ -65,14 +66,11 @@ export const meta = {
|
|||
|
||||
export default define(meta, async (ps, user) => {
|
||||
// Get votee
|
||||
const note = await Note.findOne({
|
||||
_id: ps.noteId
|
||||
const note = await getNote(ps.noteId).catch(e => {
|
||||
if (e.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError(meta.errors.noSuchNote);
|
||||
throw e;
|
||||
});
|
||||
|
||||
if (note === null) {
|
||||
throw new ApiError(meta.errors.noSuchNote);
|
||||
}
|
||||
|
||||
if (note.poll == null) {
|
||||
throw new ApiError(meta.errors.noPoll);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue