Skip to content

[stable34] fix(chat): handle Ctrl+Up hotkey for deleted and scheduled messages #18189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 1 commit into from
Jun 2, 2026
Merged

[stable34] fix(chat): handle Ctrl+Up hotkey for deleted and scheduled messages #18189

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/components/NewMessage/NewMessage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ import NewMessageTypingIndicator from './NewMessageTypingIndicator.vue'
import { useChatMentions } from '../../composables/useChatMentions.ts'
import { useGetThreadId } from '../../composables/useGetThreadId.ts'
import { useTemporaryMessage } from '../../composables/useTemporaryMessage.ts'
import { CONVERSATION, PARTICIPANT, PRIVACY } from '../../constants.ts'
import { CONVERSATION, MESSAGE, PARTICIPANT, PRIVACY } from '../../constants.ts'
import BrowserStorage from '../../services/BrowserStorage.js'
import { getTalkConfig, hasTalkFeature } from '../../services/CapabilitiesManager.ts'
import { EventBus } from '../../services/EventBus.ts'
Expand Down Expand Up @@ -1333,12 +1333,17 @@ export default {
return
}

const messagesList = this.showScheduledMessages
? this.chatExtrasStore.getScheduledMessagesList(this.token)
: this.chatStore.getMessagesList(this.token, {
threadId: this.threadId,
})
// last message within 24 hours
const lastMessageByCurrentUser = this.chatStore.getMessagesList(this.token, {
threadId: this.threadId,
}).findLast((message) => {
return this.actorStore.checkIfSelfIsActor(message)
&& !message.isTemporary && !message.systemMessage
const lastMessageByCurrentUser = messagesList.findLast((message) => {
return this.actorStore.checkIfSelfIsActor(message) // From same actor
&& message.messageType !== MESSAGE.TYPE.COMMENT_DELETED // Not deleted
&& message.timestamp !== 0 // Not temporary
&& !message.systemMessage // Not system message
&& (Date.now() - message.timestamp * 1000 < ONE_DAY_IN_MS)
})

Expand Down
Loading