diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-05-02 14:17:27 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-05-02 14:17:27 +0000 |
| commit | a0f780c4550b77d4574e0de8932a2dff288784a3 (patch) | |
| tree | 63be5e8364a2e86ab778749c7ee4b880fd2420f3 /src/services/entity_normalizer/entity_normalizer.service.js | |
| parent | 8e049297ff6a125298ba9d06a3a4a563b231360f (diff) | |
| parent | 2618c1b702d1881970cd1ee1109c421b24f2229e (diff) | |
Merge branch 'rc/2.0.3' into 'master'
Update MASTER with 2.0.3 for real
See merge request pleroma/pleroma-fe!1099
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, 2 insertions, 3 deletions
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 84169a7b..6cacd0b8 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -1,4 +1,5 @@ import escape from 'escape-html' +import { isStatusNotification } from '../notification_utils/notification_utils.js' const qvitterStatusType = (status) => { if (status.is_post_verb) { @@ -346,9 +347,7 @@ export const parseNotification = (data) => { if (masto) { output.type = mastoDict[data.type] || data.type output.seen = data.pleroma.is_seen - output.status = output.type === 'follow' || output.type === 'move' - ? null - : parseStatus(data.status) + output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null output.action = output.status // TODO: Refactor, this is unneeded output.target = output.type !== 'move' ? null |