diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-01-27 20:49:09 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-01-27 20:49:09 +0000 |
| commit | 8258c8b3f0ea22581a6072ac6e311d5254fb28b9 (patch) | |
| tree | 16ea14befcd5058de8dc3acda1120c8980cb2d9d /src | |
| parent | 6e945ee14bc4e603df3a70d51f6aeadfeeac737e (diff) | |
| parent | e4303da372687130903ee7b6c18b61a2b82601c0 (diff) | |
Merge branch 'fix-chat' into 'develop'
Properly handle websocket token (fixes chat).
See merge request pleroma/pleroma-fe!483
Diffstat (limited to 'src')
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 2 |
1 files 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 index d78c6a76..e69547b6 100644 --- 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) |