sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AP Undo Like (#3933)

Browse Source 
* AP Undo Like

* rename
This commit is contained in:
MeiMei
2019-01-20 03:07:12 +09:00
committed by syuilo
parent fa07b3023c
commit 22830965e3
6 changed files with 117 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/api/common/getters.ts Normal file
View File

@ -0,0 +1,18 @@
import * as mongo from 'mongodb';
import Note from "../../../models/note";
/**
* Get valied note for API processing
*/
export async function getValiedNote(noteId: mongo.ObjectID) {
const note = await Note.findOne({
_id: noteId,
deletedAt: { $exists: false }
});
if (note === null) {
throw 'note not found';
}
return note;
}

35
src/server/api/endpoints/notes/reactions/create.ts
View File

@ -1,8 +1,10 @@
import * as mongo from 'mongodb';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import Note from '../../../../../models/note';
import create from '../../../../../services/note/reaction/create';
import createReaction from '../../../../../services/note/reaction/create';
import { validateReaction } from '../../../../../models/note-reaction';
import define from '../../../define';
import { IUser } from '../../../../../models/user';
import { getValiedNote } from '../../../common/getters';
export const meta = {
stability: 'stable',
@ -34,25 +36,12 @@ export const meta = {
}
};
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
// Fetch reactee
const note = await Note.findOne({
_id: ps.noteId
});
if (note === null) {
return rej('note not found');
}
if (note.deletedAt != null) {
return rej('this note is already deleted');
}
try {
await create(user, note, ps.reaction);
} catch (e) {
rej(e);
}
res();
export default define(meta, (ps, user) => new Promise((res, rej) => {
createReactionById(user, ps.noteId, ps.reaction)
.then(r => res(r)).catch(e => rej(e));
}));
async function createReactionById(user: IUser, noteId: mongo.ObjectID, reaction: string) {
const note = await getValiedNote(noteId);
await createReaction(user, note, reaction);
}

55
src/server/api/endpoints/notes/reactions/delete.ts
View File

@ -1,9 +1,10 @@
import * as mongo from 'mongodb';
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import Reaction from '../../../../../models/note-reaction';
import Note from '../../../../../models/note';
import define from '../../../define';
import { publishNoteStream } from '../../../../../stream';
const ms = require('ms');
import deleteReaction from '../../../../../services/note/reaction/delete';
import { IUser } from '../../../../../models/user';
import { getValiedNote } from '../../../common/getters';
export const meta = {
desc: {
@ -33,44 +34,12 @@ export const meta = {
}
};
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
// Fetch unreactee
const note = await Note.findOne({
_id: ps.noteId
});
if (note === null) {
return rej('note not found');
}
// if already unreacted
const exist = await Reaction.findOne({
noteId: note._id,
userId: user._id,
deletedAt: { $exists: false }
});
if (exist === null) {
return rej('never reacted');
}
// Delete reaction
await Reaction.remove({
_id: exist._id
});
res();
const dec: any = {};
dec[`reactionCounts.${exist.reaction}`] = -1;
// Decrement reactions count
Note.update({ _id: note._id }, {
$inc: dec
});
publishNoteStream(note._id, 'unreacted', {
reaction: exist.reaction,
userId: user._id
});
export default define(meta, (ps, user) => new Promise((res, rej) => {
deleteReactionById(user, ps.noteId)
.then(r => res(r)).catch(e => rej(e));
}));
async function deleteReactionById(user: IUser, noteId: mongo.ObjectID) {
const note = await getValiedNote(noteId);
await deleteReaction(user, note);
}