ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-04-06 01:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix broken unread count on new rooms

Browse Source
This commit is contained in:
Ulf Gebhardt 2026-04-04 02:18:15 +02:00
parent 2d5506f75b
commit a3d2744200
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webapp/components/Chat/Chat.vue
View File

@ -331,7 +331,7 @@ export default {
if (roomIndex !== -1) { if (roomIndex !== -1) {
const changedRoom = { ...this.rooms[roomIndex] } const changedRoom = { ...this.rooms[roomIndex] }
changedRoom.unreadCount = Math.max(0, changedRoom.unreadCount - messageIds.length) changedRoom.unreadCount = Math.max(0, changedRoom.unreadCount - messageIds.length)
this.rooms[roomIndex] = changedRoom this.$set(this.rooms, roomIndex, changedRoom)
} }
// Persist to server // Persist to server
this.$apollo this.$apollo
@ -668,6 +668,7 @@ export default {
async chatMessageAdded({ data }) { async chatMessageAdded({ data }) {
const msg = data.chatMessageAdded const msg = data.chatMessageAdded
let roomIndex = this.rooms.findIndex((r) => r.id === msg.room.id) let roomIndex = this.rooms.findIndex((r) => r.id === msg.room.id)
let freshlyFetched = false
if (roomIndex === -1) { if (roomIndex === -1) {
// Room not in list yet — fetch it specifically // Room not in list yet — fetch it specifically
try { try {
@ -682,6 +683,7 @@ export default {
const newRoom = this.fixRoomObject(Room[0]) const newRoom = this.fixRoomObject(Room[0])
this.rooms = [newRoom, ...this.rooms] this.rooms = [newRoom, ...this.rooms]
roomIndex = 0 roomIndex = 0
freshlyFetched = true
} else { } else {
return return
} }
@ -695,7 +697,8 @@ export default {
changedRoom.index = new Date().toISOString() changedRoom.index = new Date().toISOString()
const isCurrentRoom = msg.room.id === this.selectedRoom?.id const isCurrentRoom = msg.room.id === this.selectedRoom?.id
const isOwnMessage = msg.senderId === this.currentUser.id const isOwnMessage = msg.senderId === this.currentUser.id
if (!isCurrentRoom && !isOwnMessage) { // Don't increment unreadCount for freshly fetched rooms — server count already includes this message
if (!freshlyFetched && !isCurrentRoom && !isOwnMessage) {
changedRoom.unreadCount++ changedRoom.unreadCount++
} }
this.moveRoomToTop(changedRoom, msg.room.id) this.moveRoomToTop(changedRoom, msg.room.id)