Kyren223/eko
1
1
Fork 0
mirror of https://github.com/Kyren223/eko.git synced 2026-07-22 03:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed first message of a user triggering the "new" line if there were no

Browse Source 
new messages in the frequency/receiver
This commit is contained in:
Kyren223
2025-02-03 17:38:19 +02:00
parent c0013eba37
commit ad25655d5f
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/client/ui/core/chat/chat.go
View File

@@ -210,7 +210,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
frequency := frequencies[m.frequencyIndex]
member := state.State.Members[*networkId][*state.UserID]
lastMsg := state.GetLastReadMessage(frequency.ID)
lastMsg := state.GetLastMessage(frequency.ID)
if m.base != SnapToBottom {
m.keepLastRead = false
} else if lastMsg != nil {
@@ -257,7 +257,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
} else if m.receiverIndex != -1 {
receiverId := state.Data.Peers[m.receiverIndex]
lastMsg := state.GetLastReadMessage(receiverId)
lastMsg := state.GetLastMessage(receiverId)
if m.base == SnapToBottom && lastMsg != nil {
lastReadMsg := state.Data.LastReadMessage[receiverId]
@@ -743,8 +743,8 @@ func (m *Model) RestoreAfterSwitch() tea.Cmd {
log.Println("Restoring frequency:", frequency.ID)
m.lastReadMsg = state.Data.LastReadMessage[frequency.ID]
if m.lastReadMsg != nil {
log.Println("LAST READ MSG", m.lastReadMsg)
lastMsg := state.GetLastMessage(frequency.ID)
if m.lastReadMsg != nil && lastMsg != nil && *m.lastReadMsg != *lastMsg {
m.keepLastRead = true
}
@@ -766,7 +766,8 @@ func (m *Model) RestoreAfterSwitch() tea.Cmd {
log.Println("Restoring signal:", receiverId)
m.lastReadMsg = state.Data.LastReadMessage[receiverId]
if m.lastReadMsg != nil {
lastMsg := state.GetLastMessage(receiverId)
if m.lastReadMsg != nil && lastMsg != nil && *m.lastReadMsg != *lastMsg {
m.keepLastRead = true
}
@@ -888,11 +889,6 @@ func (m *Model) renderMessages(screenHeight int) string {
lastReadId := state.Data.LastReadMessage[*id]
if m.keepLastRead {
// assert.NotNil(m.lastReadMsg, "TODO: REMOVE THIS", "lastReadId", lastReadId, "m.lastReadMsg", m.lastReadMsg)
// assert.Assert(*m.lastReadMsg != *lastReadId, "TODO: REMOVE THIS", "lastReadId", lastReadId, "m.lastReadMsg", m.lastReadMsg)
if m.lastReadMsg != nil && lastReadId != nil && *m.lastReadMsg == *lastReadId {
log.Println("TODO: REMOVE THIS", "lastReadId", lastReadId, "m.lastReadMsg", m.lastReadMsg)
}
lastReadId = m.lastReadMsg
}

2
internal/client/ui/core/state/state.go
View File

@@ -237,7 +237,7 @@ func UpdateTrusteds(info *packet.TrustInfo) {
}
}
func GetLastReadMessage(id snowflake.ID) *snowflake.ID {
func GetLastMessage(id snowflake.ID) *snowflake.ID {
btree := State.Messages[id]
if btree == nil {
return nil