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

19
src/server/api/models/messaging-message.ts
View file

@ -5,16 +5,17 @@ import { pack as packFile } from './drive-file';
import db from '../../../db/mongodb';
import parse from '../common/text';
const MessagingMessage = db.get<IMessagingMessage>('messaging_messages');
const MessagingMessage = db.get<IMessagingMessage>('messagingMessages');
export default MessagingMessage;
export interface IMessagingMessage {
_id: mongo.ObjectID;
created_at: Date;
createdAt: Date;
text: string;
user_id: mongo.ObjectID;
recipient_id: mongo.ObjectID;
is_read: boolean;
userId: mongo.ObjectID;
recipientId: mongo.ObjectID;
isRead: boolean;
fileId: mongo.ObjectID;
}
export function isValidText(text: string): boolean {
@ -65,16 +66,16 @@ export const pack = (
}
// Populate user
_message.user = await packUser(_message.user_id, me);
_message.user = await packUser(_message.userId, me);
if (_message.file_id) {
if (_message.fileId) {
// Populate file
_message.file = await packFile(_message.file_id);
_message.file = await packFile(_message.fileId);
}
if (opts.populateRecipient) {
// Populate recipient
_message.recipient = await packUser(_message.recipient_id, me);
_message.recipient = await packUser(_message.recipientId, me);
}
resolve(_message);