Skip to content

fix(chat): do not separate edited messages from the group - #19006

Open
Antreesy wants to merge 3 commits into
mainfrom
fix/noid/edited-combine
Open

fix(chat): do not separate edited messages from the group#19006
Antreesy wants to merge 3 commits into
mainfrom
fix/noid/edited-combine

Conversation

@Antreesy

Copy link
Copy Markdown
Contributor

β˜‘οΈ Resolves

  • Behaviour change for edited messages:
    • Edit marker is unified (pencil icon + avatar if differs from author, details in message actions menu)
    • Messages no longer ungrouped, if edited

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

πŸ–ŒοΈ UI Checklist

πŸ–ΌοΈ Screenshots / Screencasts

🏚️ Before 🏑 After
Edited caption is ungrouped, all edited messages ungrouped, foreign edits are not visible Edited caption part of combined message, all edited messages are part of respective group, foreign edits highlighted with avatar
image image
image image

🏁 Checklist

  • 🌏 Tested with different browsers / clients:
    • Chromium (Chrome / Edge / Opera / Brave)
    • Firefox
    • Safari
    • Talk Desktop
    • Integrations with Files sidebar and other apps
    • Not risky to browser differences / client
  • πŸ–ŒοΈ Design was reviewed, approved or inspired by the design team
  • ⛑️ Tests are included or not possible
  • πŸ“— User documentation in https://github.com/nextcloud/documentation/tree/master/user_manual/talk has been updated or is not required

Assisted-by: ClaudeCode:claude-sonnet-5
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
- if both are users, avatar wasn't shown

Assisted-by: ClaudeCode:claude-sonnet-5
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
- including list view
- remove duplicate string next to display name

Assisted-by: ClaudeCode:claude-sonnet-5
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
@Antreesy Antreesy added this to the β›… Next Beta/RC (35) milestone Aug 14, 2026
@Antreesy Antreesy self-assigned this Aug 14, 2026
@nextcloud-command nextcloud-command added the AI assisted This PR contains AI-assisted commits label Aug 14, 2026
Comment on lines 504 to 509
isEditorDifferentThenAuthor() {
return this.message.lastEditActorId
&& this.message.lastEditActorId !== this.message.actorId
&& this.message.lastEditActorDisplayName !== this.message.actorDisplayName
&& this.message.lastEditActorType !== this.message.actorType
&& (this.message.lastEditActorId !== this.message.actorId
|| this.message.lastEditActorType !== this.message.actorType)
},

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

two different users with the same name will pass this and will be read as self-edited

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So then we should fully remove displayName condition? actorId+actorType pair is unique enough

color: var(--color-text-maxcontrast);
font-size: var(--default-font-size);
width: $messages-info-width;
min-width: $messages-info-width;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not reset in split mode css classes. So instead of width: auto , min-width: 0; needs to be added there --sided (line 692) and --compressed-system (line 673)

Image

const firstMessage = computed(() => messages.value[0])
const {
remoteServer,
lastEditor,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was the only consumer of this computed. Instead of removing it, maybe keep it and add in aria label of the pencil icon?

Comment on lines -595 to -598
if (!!message1.lastEditTimestamp || !!message2.lastEditTimestamp) {
return false // Edited messages are not grouped
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a test test('does not group edited messages') to be removed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI assisted This PR contains AI-assisted commits bug design feature: chat πŸ’¬ Chat and system messages feature: frontend πŸ–ŒοΈ "Web UI" client

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants