report notification wip
This commit is contained in:
parent
fa2884a805
commit
15bed586dc
4 changed files with 23 additions and 1 deletions
|
@ -4,6 +4,8 @@ const tabModeDict = {
|
||||||
mentions: ['mention'],
|
mentions: ['mention'],
|
||||||
'likes+repeats': ['repeat', 'like'],
|
'likes+repeats': ['repeat', 'like'],
|
||||||
follows: ['follow'],
|
follows: ['follow'],
|
||||||
|
reactions: ['pleroma:emoji_reaction'],
|
||||||
|
reports: ['pleroma:report'],
|
||||||
moves: ['move']
|
moves: ['move']
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,15 @@
|
||||||
key="follows"
|
key="follows"
|
||||||
:label="$t('interactions.follows')"
|
:label="$t('interactions.follows')"
|
||||||
/>
|
/>
|
||||||
|
<span
|
||||||
|
key="reactions"
|
||||||
|
:label="$t('interactions.emoji_reactions')"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
v-if="canSeeReports"
|
||||||
|
key="reports"
|
||||||
|
:label="$t('interactions.reports')"
|
||||||
|
/>
|
||||||
<span
|
<span
|
||||||
v-if="!allowFollowingMove"
|
v-if="!allowFollowingMove"
|
||||||
key="moves"
|
key="moves"
|
||||||
|
|
|
@ -367,6 +367,13 @@ export const parseNotification = (data) => {
|
||||||
: parseUser(data.target)
|
: parseUser(data.target)
|
||||||
output.from_profile = parseUser(data.account)
|
output.from_profile = parseUser(data.account)
|
||||||
output.emoji = data.emoji
|
output.emoji = data.emoji
|
||||||
|
if (data.report) {
|
||||||
|
output.report = data.report
|
||||||
|
output.report.content = data.report.content
|
||||||
|
output.report.acct = parseUser(data.report.acct)
|
||||||
|
output.report.actor = parseUser(data.report.actor)
|
||||||
|
output.report.statuses = data.report.statuses.map(parseStatus)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
const parsedNotice = parseStatus(data.notice)
|
const parsedNotice = parseStatus(data.notice)
|
||||||
output.type = data.ntype
|
output.type = data.ntype
|
||||||
|
|
|
@ -14,7 +14,8 @@ export const visibleTypes = store => {
|
||||||
rootState.config.notificationVisibility.follows && 'follow',
|
rootState.config.notificationVisibility.follows && 'follow',
|
||||||
rootState.config.notificationVisibility.followRequest && 'follow_request',
|
rootState.config.notificationVisibility.followRequest && 'follow_request',
|
||||||
rootState.config.notificationVisibility.moves && 'move',
|
rootState.config.notificationVisibility.moves && 'move',
|
||||||
rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction'
|
rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction',
|
||||||
|
rootState.config.notificationVisibility.reports && 'pleroma:report'
|
||||||
].filter(_ => _))
|
].filter(_ => _))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -91,6 +92,9 @@ export const prepareNotificationObject = (notification, i18n) => {
|
||||||
case 'follow_request':
|
case 'follow_request':
|
||||||
i18nString = 'follow_request'
|
i18nString = 'follow_request'
|
||||||
break
|
break
|
||||||
|
case 'pleroma:report':
|
||||||
|
i18nString = 'reported'
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if (notification.type === 'pleroma:emoji_reaction') {
|
if (notification.type === 'pleroma:emoji_reaction') {
|
||||||
|
|
Loading…
Reference in a new issue