therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'feat/relationship-refactor'

Browse source 
# Conflicts:
#   src/components/notification/notification.js
This commit is contained in:
Shpuld Shpludson 2020-05-08 08:35:30 +00:00
commit 1186205583
26 changed files with 1071 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -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) {
@ -340,9 +341,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