summaryrefslogtreecommitdiff
path: root/src/api/serializers
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-03-18 20:05:11 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-03-18 20:05:11 +0900
commit45e8331e261244628b134a18e3d0fbe0ebb3a7dc (patch)
tree44ac1719fcea0a61c33698b23fb89400141e00d9 /src/api/serializers
parentBetter notification (diff)
downloadsharkey-45e8331e261244628b134a18e3d0fbe0ebb3a7dc.tar.gz
sharkey-45e8331e261244628b134a18e3d0fbe0ebb3a7dc.tar.bz2
sharkey-45e8331e261244628b134a18e3d0fbe0ebb3a7dc.zip
:sushi:
Closes #12, #227 and #58
Diffstat (limited to 'src/api/serializers')
-rw-r--r--src/api/serializers/app.ts2
-rw-r--r--src/api/serializers/auth-session.ts2
-rw-r--r--src/api/serializers/drive-file.ts2
-rw-r--r--src/api/serializers/drive-folder.ts2
-rw-r--r--src/api/serializers/drive-tag.ts2
-rw-r--r--src/api/serializers/messaging-message.ts10
-rw-r--r--src/api/serializers/notification.ts2
-rw-r--r--src/api/serializers/post.ts10
-rw-r--r--src/api/serializers/signin.ts2
-rw-r--r--src/api/serializers/user.ts2
10 files changed, 14 insertions, 22 deletions
diff --git a/src/api/serializers/app.ts b/src/api/serializers/app.ts
index fdeef338d9..9d1c46dca4 100644
--- a/src/api/serializers/app.ts
+++ b/src/api/serializers/app.ts
@@ -1,5 +1,3 @@
-'use strict';
-
/**
* Module dependencies
*/
diff --git a/src/api/serializers/auth-session.ts b/src/api/serializers/auth-session.ts
index 4efb7729c4..a9acf1243a 100644
--- a/src/api/serializers/auth-session.ts
+++ b/src/api/serializers/auth-session.ts
@@ -1,5 +1,3 @@
-'use strict';
-
/**
* Module dependencies
*/
diff --git a/src/api/serializers/drive-file.ts b/src/api/serializers/drive-file.ts
index e6e2f6cae3..b4e2ab064a 100644
--- a/src/api/serializers/drive-file.ts
+++ b/src/api/serializers/drive-file.ts
@@ -1,5 +1,3 @@
-'use strict';
-
/**
* Module dependencies
*/
diff --git a/src/api/serializers/drive-folder.ts b/src/api/serializers/drive-folder.ts
index ac3bd13c3a..34fdc0d905 100644
--- a/src/api/serializers/drive-folder.ts
+++ b/src/api/serializers/drive-folder.ts
@@ -1,5 +1,3 @@
-'use strict';
-
/**
* Module dependencies
*/
diff --git a/src/api/serializers/drive-tag.ts b/src/api/serializers/drive-tag.ts
index 3e800ca5bd..2f152381bd 100644
--- a/src/api/serializers/drive-tag.ts
+++ b/src/api/serializers/drive-tag.ts
@@ -1,5 +1,3 @@
-'use strict';
-
/**
* Module dependencies
*/
diff --git a/src/api/serializers/messaging-message.ts b/src/api/serializers/messaging-message.ts
index da63f8b99e..4ab95e42a3 100644
--- a/src/api/serializers/messaging-message.ts
+++ b/src/api/serializers/messaging-message.ts
@@ -1,13 +1,12 @@
-'use strict';
-
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
+import deepcopy = require('deepcopy');
import Message from '../models/messaging-message';
import serializeUser from './user';
import serializeDriveFile from './drive-file';
-import deepcopy = require('deepcopy');
+import parse from '../common/text';
/**
* Serialize a message
@@ -47,6 +46,11 @@ export default (
_message.id = _message._id;
delete _message._id;
+ // Parse text
+ if (_message.text) {
+ _message.ast = parse(_message.text);
+ }
+
// Populate user
_message.user = await serializeUser(_message.user_id, me);
diff --git a/src/api/serializers/notification.ts b/src/api/serializers/notification.ts
index 43add127e0..50952e5426 100644
--- a/src/api/serializers/notification.ts
+++ b/src/api/serializers/notification.ts
@@ -1,5 +1,3 @@
-'use strict';
-
/**
* Module dependencies
*/
diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts
index b71b42e9a4..f459529697 100644
--- a/src/api/serializers/post.ts
+++ b/src/api/serializers/post.ts
@@ -1,16 +1,15 @@
-'use strict';
-
/**
* Module dependencies
*/
import * as mongo from 'mongodb';
+import deepcopy = require('deepcopy');
import Post from '../models/post';
import Like from '../models/like';
import Vote from '../models/poll-vote';
import serializeApp from './app';
import serializeUser from './user';
import serializeDriveFile from './drive-file';
-import deepcopy = require('deepcopy');
+import parse from '../common/text';
/**
* Serialize a post
@@ -54,6 +53,11 @@ const self = (
delete _post.mentions;
+ // Parse text
+ if (_post.text) {
+ _post.ast = parse(_post.text);
+ }
+
// Populate user
_post.user = await serializeUser(_post.user_id, me);
diff --git a/src/api/serializers/signin.ts b/src/api/serializers/signin.ts
index 39226f8bd4..4068067678 100644
--- a/src/api/serializers/signin.ts
+++ b/src/api/serializers/signin.ts
@@ -1,5 +1,3 @@
-'use strict';
-
/**
* Module dependencies
*/
diff --git a/src/api/serializers/user.ts b/src/api/serializers/user.ts
index de215808a4..d367dc8657 100644
--- a/src/api/serializers/user.ts
+++ b/src/api/serializers/user.ts
@@ -1,5 +1,3 @@
-'use strict';
-
/**
* Module dependencies
*/