nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Better name for the newestMessage of a chat

Browse Source
This commit is contained in:
Vitor Pamplona
2025-08-12 11:43:57 -04:00
parent 14582fe9b6
commit 25aaed80b0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/model/privateChats/Chatroom.kt
+5 -5
View File
@@ -38,7 +38,7 @@ class Chatroom : NotesGatherer {
var subject = MutableStateFlow<String?>(null) var subject = MutableStateFlow<String?>(null)
var subjectCreatedAt: Long? = null var subjectCreatedAt: Long? = null
var ownerSentMessage: Boolean = false var ownerSentMessage: Boolean = false
var lastMessage: Note? = null var newestMessage: Note? = null
override fun removeNote(note: Note) { override fun removeNote(note: Note) {
removeMessageSync(note) removeMessageSync(note)
@@ -57,8 +57,8 @@ class Chatroom : NotesGatherer {
} }
val createdAt = msg.createdAt() ?: 0 val createdAt = msg.createdAt() ?: 0
if (createdAt > (lastMessage?.createdAt() ?: 0)) { if (createdAt > (newestMessage?.createdAt() ?: 0)) {
lastMessage = msg newestMessage = msg
} }
val newSubject = msg.event?.subject() val newSubject = msg.event?.subject()
@@ -78,8 +78,8 @@ class Chatroom : NotesGatherer {
messages = messages - msg messages = messages - msg
msg.removeGatherer(this) msg.removeGatherer(this)
if (msg == lastMessage) { if (msg == newestMessage) {
lastMessage = messages.maxByOrNull { it.createdAt() ?: 0 } newestMessage = messages.maxByOrNull { it.createdAt() ?: 0 }
} }
if (msg.event?.subject() == subject.value) { if (msg.event?.subject() == subject.value) {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListKnownFeedFilter.kt
+1 -1
View File
@@ -47,7 +47,7 @@ class ChatroomListKnownFeedFilter(
if ((chatroom.senderIntersects(followingKeySet) || chatList.hasSentMessagesTo(key)) && if ((chatroom.senderIntersects(followingKeySet) || chatList.hasSentMessagesTo(key)) &&
!account.isAllHidden(key.users) !account.isAllHidden(key.users)
) { ) {
chatroom.lastMessage chatroom.newestMessage
} else { } else {
null null
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/dal/ChatroomListNewFeedFilter.kt
+1 -1
View File
@@ -41,7 +41,7 @@ class ChatroomListNewFeedFilter(
val privateMessages = val privateMessages =
chatList.rooms.mapNotNull { key, chatroom -> chatList.rooms.mapNotNull { key, chatroom ->
if (!chatroom.senderIntersects(followingKeySet) && !chatList.hasSentMessagesTo(key) && !account.isAllHidden(key.users)) { if (!chatroom.senderIntersects(followingKeySet) && !chatList.hasSentMessagesTo(key) && !account.isAllHidden(key.users)) {
chatroom.lastMessage chatroom.newestMessage
} else { } else {
null null
} }