Refactor
This commit is contained in:
@@ -1,8 +1,7 @@
|
||||
import $ from 'cafy';
|
||||
import Vote from '../../../../../models/poll-vote';
|
||||
import Note, { pack } from '../../../../../models/note';
|
||||
import { ILocalUser } from '../../../../../models/user';
|
||||
import getParams from '../../../get-params';
|
||||
import define from '../../../define';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
@@ -25,10 +24,7 @@ export const meta = {
|
||||
}
|
||||
};
|
||||
|
||||
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
|
||||
const [ps, psErr] = getParams(meta, params);
|
||||
if (psErr) return rej(psErr);
|
||||
|
||||
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
|
||||
// Get votes
|
||||
const votes = await Vote.find({
|
||||
userId: user._id
|
||||
@@ -64,4 +60,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
|
||||
res(await Promise.all(notes.map(note => pack(note, user, {
|
||||
detail: true
|
||||
}))));
|
||||
});
|
||||
}));
|
||||
|
@@ -5,8 +5,7 @@ import Watching from '../../../../../models/note-watching';
|
||||
import watch from '../../../../../services/note/watch';
|
||||
import { publishNoteStream } from '../../../../../stream';
|
||||
import notify from '../../../../../notify';
|
||||
import { ILocalUser } from '../../../../../models/user';
|
||||
import getParams from '../../../get-params';
|
||||
import define from '../../../define';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
@@ -30,10 +29,7 @@ export const meta = {
|
||||
}
|
||||
};
|
||||
|
||||
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
|
||||
const [ps, psErr] = getParams(meta, params);
|
||||
if (psErr) return rej(psErr);
|
||||
|
||||
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
|
||||
// Get votee
|
||||
const note = await Note.findOne({
|
||||
_id: ps.noteId
|
||||
@@ -114,4 +110,4 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
|
||||
if (user.settings.autoWatch !== false) {
|
||||
watch(user._id, note);
|
||||
}
|
||||
});
|
||||
}));
|
||||
|
Reference in New Issue
Block a user