diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-03-28 13:13:10 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-03-28 13:13:10 +0900 |
| commit | 73bb57480b01ece02bdf43866389bc9ef478f271 (patch) | |
| tree | 83629b3b309c9dd5920a4782113c0e44e33bccfa /src/api | |
| parent | Merge remote-tracking branch 'refs/remotes/origin/master' into #1288-2 (diff) | |
| download | sharkey-73bb57480b01ece02bdf43866389bc9ef478f271.tar.gz sharkey-73bb57480b01ece02bdf43866389bc9ef478f271.tar.bz2 sharkey-73bb57480b01ece02bdf43866389bc9ef478f271.zip | |
wip
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/models/messaging-history.ts | 12 | ||||
| -rw-r--r-- | src/api/models/messaging-message.ts | 11 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/api/models/messaging-history.ts b/src/api/models/messaging-history.ts index c06987e451..1e79032ed6 100644 --- a/src/api/models/messaging-history.ts +++ b/src/api/models/messaging-history.ts @@ -1,3 +1,13 @@ +import * as mongo from 'mongodb'; import db from '../../db/mongodb'; -export default db.get('messaging_histories') as any; // fuck type definition +const MessagingHistory = db.get<IMessagingHistory>('messagingHistories'); +export default MessagingHistory; + +export type IMessagingHistory = { + _id: mongo.ObjectID; + updatedAt: Date; + userId: mongo.ObjectID; + partnerId: mongo.ObjectID; + messageId: mongo.ObjectID; +}; diff --git a/src/api/models/messaging-message.ts b/src/api/models/messaging-message.ts index fcb356c5ca..026b23cf36 100644 --- a/src/api/models/messaging-message.ts +++ b/src/api/models/messaging-message.ts @@ -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 { |