diff options
| author | dave <starpumadev@gmail.com> | 2019-03-25 14:47:54 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-25 14:47:54 -0400 |
| commit | 6143b1ce0febe0451305918d1c735c4c23071701 (patch) | |
| tree | 4be42874c05043599caf80894808842c674791f1 /src/services/entity_normalizer/entity_normalizer.service.js | |
| parent | 6a9159b25598d578018643673568bbcd06ea1e12 (diff) | |
| parent | 854d0e80512d2da80cd5153144698a5148da4aa6 (diff) | |
Resolve merge conflict,
Fix few issues (conversation page highlight, fetch conversation, ...)
Diffstat (limited to 'src/services/entity_normalizer/entity_normalizer.service.js')
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 57a6adf9..5cac3463 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -128,14 +128,15 @@ export const parseUser = (data) => { return output } -const parseAttachment = (data) => { +export const parseAttachment = (data) => { const output = {} const masto = !data.hasOwnProperty('oembed') if (masto) { // Not exactly same... - output.mimetype = data.type + output.mimetype = data.pleroma ? data.pleroma.mime_type : data.type output.meta = data.meta // not present in BE yet + output.id = data.id } else { output.mimetype = data.mimetype // output.meta = ??? missing |