renun/BewlyBewly
1
0
Fork 0
mirror of https://github.com/BewlyBewly/BewlyBewly.git synced 2025-04-14 13:15:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Hakadao
2024-04-19 10:53:15 +08:00
parent 0e97808775 591ea2ef77
commit 46a8f89ecd
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/TopBar/TopBar.vue
View File

@@ -126,7 +126,7 @@ watch(
if (newVal === oldVal)
return
if (!newVal)
if (newVal)
getUnreadMessageCount()
},
)
@@ -137,7 +137,7 @@ watch(
if (newVal === oldVal)
return
if (!newVal)
if (newVal)
await getTopBarNewMomentsCount()
},
)
@@ -261,8 +261,10 @@ async function getUnreadMessageCount() {
if (res.code === 0) {
Object.assign(unReadMessage, res.data)
Object.entries(unReadMessage).forEach(([key, value]) => {
if (key !== 'up')
unReadMessageCount.value += typeof value === 'number' ? value : 0
if (key !== 'up') {
if (typeof value === 'number')
unReadMessageCount.value += value
}
})
}
@@ -271,7 +273,8 @@ async function getUnreadMessageCount() {
})
if (res.code === 0) {
Object.assign(unReadDm, res.data)
unReadMessageCount.value += unReadDm.follow_unread
if (typeof unReadDm.follow_unread === 'number')
unReadMessageCount.value += unReadDm.follow_unread
}
}
catch (error) {
@@ -290,10 +293,9 @@ async function getTopBarNewMomentsCount() {
const res = await browser.runtime.sendMessage({
contentScriptQuery: 'getTopBarNewMomentsCount',
})
newMomentsCount.value = res.data.update_info.item.count
// If moments count > 0 then refresh the key to get the new moments
if (newMomentsCount.value > 0)
momentsPopKey.value = `momentsPop[${Number(new Date())}]`
if (typeof res.data.update_info.item.count === 'number')
newMomentsCount.value = res.data.update_info.item.count
}
catch {
newMomentsCount.value = 0