summaryrefslogtreecommitdiff
path: root/src/models
diff options
context:
space:
mode:
authorAkihiko Odaki <nekomanma@pixiv.co.jp>2018-03-31 19:53:30 +0900
committerAkihiko Odaki <nekomanma@pixiv.co.jp>2018-03-31 20:30:28 +0900
commit7da60a0147116130a94274e4a20ae54dd7d59dea (patch)
tree442514d76f90ede80906659b14d5f7bbc531d32a /src/models
parentSet empty array instead of null to mediaIds property of posts (diff)
downloadmisskey-7da60a0147116130a94274e4a20ae54dd7d59dea.tar.gz
misskey-7da60a0147116130a94274e4a20ae54dd7d59dea.tar.bz2
misskey-7da60a0147116130a94274e4a20ae54dd7d59dea.zip
Store texts as HTML
Diffstat (limited to 'src/models')
-rw-r--r--src/models/messaging-message.ts7
-rw-r--r--src/models/post.ts7
2 files changed, 2 insertions, 12 deletions
diff --git a/src/models/messaging-message.ts b/src/models/messaging-message.ts
index 8bee657c34..974ee54ab8 100644
--- a/src/models/messaging-message.ts
+++ b/src/models/messaging-message.ts
@@ -3,7 +3,6 @@ import deepcopy = require('deepcopy');
import { pack as packUser } from './user';
import { pack as packFile } from './drive-file';
import db from '../db/mongodb';
-import parse from '../common/text';
const MessagingMessage = db.get<IMessagingMessage>('messagingMessages');
export default MessagingMessage;
@@ -12,6 +11,7 @@ export interface IMessagingMessage {
_id: mongo.ObjectID;
createdAt: Date;
text: string;
+ textHtml: string;
userId: mongo.ObjectID;
recipientId: mongo.ObjectID;
isRead: boolean;
@@ -60,11 +60,6 @@ export const pack = (
_message.id = _message._id;
delete _message._id;
- // Parse text
- if (_message.text) {
- _message.ast = parse(_message.text);
- }
-
// Populate user
_message.user = await packUser(_message.userId, me);
diff --git a/src/models/post.ts b/src/models/post.ts
index 9bc0c1d3b9..6c853e4f81 100644
--- a/src/models/post.ts
+++ b/src/models/post.ts
@@ -8,7 +8,6 @@ import { pack as packChannel } from './channel';
import Vote from './poll-vote';
import Reaction from './post-reaction';
import { pack as packFile } from './drive-file';
-import parse from '../common/text';
const Post = db.get<IPost>('posts');
@@ -31,6 +30,7 @@ export type IPost = {
repostId: mongo.ObjectID;
poll: any; // todo
text: string;
+ textHtml: string;
cw: string;
userId: mongo.ObjectID;
appId: mongo.ObjectID;
@@ -103,11 +103,6 @@ export const pack = async (
delete _post.mentions;
if (_post.geo) delete _post.geo.type;
- // Parse text
- if (_post.text) {
- _post.ast = parse(_post.text);
- }
-
// Populate user
_post.user = packUser(_post.userId, meId);