diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-05-01 20:24:25 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-05-01 20:24:25 +0000 |
| commit | c67e9daf068c5a7eafaa7ce6a6418c8916a4f118 (patch) | |
| tree | 8b6d1b006c7d3e74a5e5b3515f1a55a99aaa4b21 /src/services/entity_normalizer/entity_normalizer.service.js | |
| parent | af3e69743e3192898f185fbc867defa1d155a4d4 (diff) | |
| parent | 01b07f01e9340935faf51e5a3c8034cc90423989 (diff) | |
Merge branch 'follow-request-notification' into 'develop'
Add support for follow request notifications
Closes #823 and #822
See merge request pleroma/pleroma-fe!1093
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 |