parent
f61054a3d5
commit
276c6e7bea
|
@ -498,6 +498,7 @@ export default {
|
||||||
accountFollowedYou: '{name} followed you, {account}',
|
accountFollowedYou: '{name} followed you, {account}',
|
||||||
accountSignedUp: '{name} signed up, {account}',
|
accountSignedUp: '{name} signed up, {account}',
|
||||||
accountRequestedFollow: '{name} requested to follow you, {account}',
|
accountRequestedFollow: '{name} requested to follow you, {account}',
|
||||||
|
accountReported: '{name} filed a report, {account}',
|
||||||
reblogCountsHidden: 'Boost counts hidden',
|
reblogCountsHidden: 'Boost counts hidden',
|
||||||
favoriteCountsHidden: 'Favorite counts hidden',
|
favoriteCountsHidden: 'Favorite counts hidden',
|
||||||
rebloggedTimes: `Boosted {count, plural,
|
rebloggedTimes: `Boosted {count, plural,
|
||||||
|
@ -514,6 +515,7 @@ export default {
|
||||||
followedYou: 'followed you',
|
followedYou: 'followed you',
|
||||||
edited: 'edited their toot',
|
edited: 'edited their toot',
|
||||||
requestedFollow: 'requested to follow you',
|
requestedFollow: 'requested to follow you',
|
||||||
|
reported: 'filed a report',
|
||||||
signedUp: 'signed up',
|
signedUp: 'signed up',
|
||||||
posted: 'posted',
|
posted: 'posted',
|
||||||
pollYouCreatedEnded: 'A poll you created has ended',
|
pollYouCreatedEnded: 'A poll you created has ended',
|
||||||
|
|
|
@ -66,7 +66,7 @@ export async function getTimeline (instanceName, accessToken, timeline, maxId, s
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timeline === 'notifications/mentions') {
|
if (timeline === 'notifications/mentions') {
|
||||||
params.exclude_types = ['follow', 'favourite', 'reblog', 'poll', 'admin.sign_up', 'update', 'follow_request']
|
params.exclude_types = ['follow', 'favourite', 'reblog', 'poll', 'admin.sign_up', 'update', 'follow_request', 'admin.report']
|
||||||
}
|
}
|
||||||
|
|
||||||
url += '?' + paramsString(params)
|
url += '?' + paramsString(params)
|
||||||
|
|
|
@ -78,6 +78,8 @@
|
||||||
return formatIntl('intl.accountSignedUp', params)
|
return formatIntl('intl.accountSignedUp', params)
|
||||||
} else if (notificationType === 'follow_request') {
|
} else if (notificationType === 'follow_request') {
|
||||||
return formatIntl('intl.accountRequestedFollow', params)
|
return formatIntl('intl.accountRequestedFollow', params)
|
||||||
|
} else if (notificationType === 'admin.report') {
|
||||||
|
return formatIntl('intl.accountReported', params)
|
||||||
} else { // 'follow'
|
} else { // 'follow'
|
||||||
return formatIntl('intl.accountFollowedYou', params)
|
return formatIntl('intl.accountFollowedYou', params)
|
||||||
}
|
}
|
||||||
|
|
|
@ -141,6 +141,8 @@
|
||||||
return '#fa-pencil'
|
return '#fa-pencil'
|
||||||
} else if (notificationType === 'follow_request') {
|
} else if (notificationType === 'follow_request') {
|
||||||
return '#fa-hourglass'
|
return '#fa-hourglass'
|
||||||
|
} else if (notificationType === 'admin.report') {
|
||||||
|
return '#fa-flag'
|
||||||
}
|
}
|
||||||
return '#fa-star'
|
return '#fa-star'
|
||||||
},
|
},
|
||||||
|
@ -167,6 +169,8 @@
|
||||||
return 'intl.edited'
|
return 'intl.edited'
|
||||||
} else if (notificationType === 'follow_request') {
|
} else if (notificationType === 'follow_request') {
|
||||||
return 'intl.requestedFollow'
|
return 'intl.requestedFollow'
|
||||||
|
} else if (notificationType === 'admin.report') {
|
||||||
|
return 'intl.reported'
|
||||||
} else {
|
} else {
|
||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
|
|
|
@ -216,6 +216,7 @@ async function showRichNotification (data, notification) {
|
||||||
switch (notification.type) {
|
switch (notification.type) {
|
||||||
case 'follow':
|
case 'follow':
|
||||||
case 'follow_request':
|
case 'follow_request':
|
||||||
|
case 'admin.report':
|
||||||
case 'admin.sign_up': {
|
case 'admin.sign_up': {
|
||||||
await self.registration.showNotification(data.title, {
|
await self.registration.showNotification(data.title, {
|
||||||
badge,
|
badge,
|
||||||
|
|
Loading…
Reference in a new issue