moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-chat' into 'develop' 

Properly handle websocket token (fixes chat).

See merge request pleroma/pleroma-fe!483
This commit is contained in:
Shpuld Shpludson 2019-01-27 20:49:09 +00:00
parent 6e945ee14b e4303da372
commit 8258c8b3f0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/entity_normalizer/entity_normalizer.service.js
View File

@ -104,6 +104,8 @@ export const parseUser = (data) => {
output.background_image = data.background_image output.background_image = data.background_image
// on mastoapi this info is contained in a "relationship" // on mastoapi this info is contained in a "relationship"
output.following = data.following output.following = data.following
// Websocket token
output.token = data.token
} }
output.created_at = new Date(data.created_at) output.created_at = new Date(data.created_at)