commit: 8258c8b3f0ea22581a6072ac6e311d5254fb28b9
parent: 6e945ee14bc4e603df3a70d51f6aeadfeeac737e
Author: Shpuld Shpludson <shp@cock.li>
Date: Sun, 27 Jan 2019 20:49:09 +0000
Merge branch 'fix-chat' into 'develop'
Properly handle websocket token (fixes chat).
See merge request pleroma/pleroma-fe!483
Diffstat:
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -104,6 +104,8 @@ export const parseUser = (data) => {
output.background_image = data.background_image
// on mastoapi this info is contained in a "relationship"
output.following = data.following
+ // Websocket token
+ output.token = data.token
}
output.created_at = new Date(data.created_at)