Merge branch 'setttingssync' into shigusegubu-themes3
This commit is contained in:
commit
603d850014
2 changed files with 5 additions and 4 deletions
|
|
@ -65,22 +65,24 @@ const sortById = (a, b) => {
|
|||
}
|
||||
}
|
||||
|
||||
const isMutedNotification = (notification) => {
|
||||
const isMutedNotification = (muteFilters, notification) => {
|
||||
if (!notification.status) return false
|
||||
if (notification.status.muted) return true
|
||||
return muteFilterHits(notification.status).length > 0
|
||||
return muteFilterHits(muteFilters, notification.status).length > 0
|
||||
}
|
||||
|
||||
export const maybeShowNotification = (
|
||||
store,
|
||||
notificationVisibility,
|
||||
muteFilters,
|
||||
notification,
|
||||
) => {
|
||||
console.log('NOTIF', store, notificationVisibility, muteFilters, notification)
|
||||
const rootState = store.rootState || store.state
|
||||
|
||||
if (notification.seen) return
|
||||
if (!visibleTypes(notificationVisibility).includes(notification.type)) return
|
||||
if (notification.type === 'mention' && isMutedNotification(notification))
|
||||
if (notification.type === 'mention' && isMutedNotification(muteFilters, notification))
|
||||
return
|
||||
|
||||
const notificationObject = prepareNotificationObject(
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@ export const useInterfaceStore = defineStore('interface', {
|
|||
},
|
||||
setPageTitle(option = '') {
|
||||
try {
|
||||
console.log('TITLE', option, useInstanceStore().instanceIdentity.name)
|
||||
document.title = `${option} ${useInstanceStore().instanceIdentity.name}`
|
||||
} catch (error) {
|
||||
console.error(`${error}`)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue