Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server/api/models/post-reaction.ts
View file

@ -4,13 +4,15 @@ import db from '../../../db/mongodb';
import Reaction from './post-reaction';
import { pack as packUser } from './user';
const PostReaction = db.get<IPostReaction>('post_reactions');
const PostReaction = db.get<IPostReaction>('postReactions');
export default PostReaction;
export interface IPostReaction {
_id: mongo.ObjectID;
created_at: Date;
deleted_at: Date;
createdAt: Date;
deletedAt: Date;
postId: mongo.ObjectID;
userId: mongo.ObjectID;
reaction: string;
}
@ -45,7 +47,7 @@ export const pack = (
delete _reaction._id;
// Populate user
_reaction.user = await packUser(_reaction.user_id, me);
_reaction.user = await packUser(_reaction.userId, me);
resolve(_reaction);
});