hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

handle akkoma not supporting status notification type

Browse source
This commit is contained in:
Henry Jameson 2025-06-29 02:49:35 +03:00
commit 4b5e6804a9
2 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/instance.js
View file

@ -157,6 +157,7 @@ const defaultState = {
pleromaCustomEmojiReactionsAvailable: false, pleromaCustomEmojiReactionsAvailable: false,
pleromaBookmarkFoldersAvailable: false, pleromaBookmarkFoldersAvailable: false,
pleromaPublicFavouritesAvailable: true, pleromaPublicFavouritesAvailable: true,
statusNotificationTypeAvailable: true,
gopherAvailable: false, gopherAvailable: false,
mediaProxyAvailable: false, mediaProxyAvailable: false,
suggestionsEnabled: false, suggestionsEnabled: false,

27
src/services/notifications_fetcher/notifications_fetcher.service.js
View file

@ -5,11 +5,10 @@ import { promiseInterval } from '../promise_interval/promise_interval.js'
const update = ({ store, notifications, older }) => { const update = ({ store, notifications, older }) => {
store.dispatch('addNewNotifications', { notifications, older }) store.dispatch('addNewNotifications', { notifications, older })
} }
//
const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
// For using include_types when fetching notifications. // For using include_types when fetching notifications.
// Note: chat_mention excluded as pleroma-fe polls them separately // Note: chat_mention excluded as pleroma-fe polls them separately
const mastoApiNotificationTypes = [ const mastoApiNotificationTypes = new Set([
'mention', 'mention',
'status', 'status',
'favourite', 'favourite',
@ -19,8 +18,11 @@ const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
'move', 'move',
'poll', 'poll',
'pleroma:emoji_reaction', 'pleroma:emoji_reaction',
'pleroma:report' 'pleroma:report',
] 'test'
])
const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
const args = { credentials } const args = { credentials }
const { getters } = store const { getters } = store
@ -29,7 +31,11 @@ const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
const hideMutedPosts = getters.mergedConfig.hideMutedPosts const hideMutedPosts = getters.mergedConfig.hideMutedPosts
if (rootState.instance.pleromaChatMessagesAvailable) { if (rootState.instance.pleromaChatMessagesAvailable) {
mastoApiNotificationTypes.push('pleroma:chat_mention') mastoApiNotificationTypes.add('pleroma:chat_mention')
}
if (!rootState.instance.statusNotificationTypeAvailable) {
mastoApiNotificationTypes.delete('status')
} }
args.includeTypes = mastoApiNotificationTypes args.includeTypes = mastoApiNotificationTypes
@ -75,8 +81,17 @@ const fetchNotifications = ({ store, args, older }) => {
return apiService.fetchTimeline(args) return apiService.fetchTimeline(args)
.then((response) => { .then((response) => {
if (response.errors) { if (response.errors) {
if (response.status === 400) {
store.dispatch('setInstanceOption', {
name: 'statusNotificationTypeAvailable',
value: false
})
mastoApiNotificationTypes.delete('status')
return fetchNotifications({ store, args, older })
} else {
throw new Error(`${response.status} ${response.statusText}`) throw new Error(`${response.status} ${response.statusText}`)
} }
}
const notifications = response.data const notifications = response.data
update({ store, notifications, older }) update({ store, notifications, older })
return notifications return notifications