Skip to content
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.

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

fix(stream): Don't render avatar for federated users #1744

Merged
merged 2 commits into from
Aug 1, 2024

Conversation

nickvergessen
Copy link
Member

Before After
Bildschirmfoto vom 2024-08-01 12-23-24 Bildschirmfoto vom 2024-08-01 12-21-12

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Copy link

@Antreesy Antreesy left a comment

Choose a reason for hiding this comment

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

Otherwise fine

Comment on lines +49 to +59
if (richObject.server) {
return {
component: NcUserBubble,
props: {
avatarImage: 'icon-user',
displayName: richObject.name,
user: richObject.id,
url: richObject.link,
},
}
}
Copy link

Choose a reason for hiding this comment

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

Maybe replace existing code with it to avoid duplications?

Suggested change
if (richObject.server) {
return {
component: NcUserBubble,
props: {
avatarImage: 'icon-user',
displayName: richObject.name,
user: richObject.id,
url: richObject.link,
},
}
}
return {
component: NcUserBubble,
props: {
// show thumbnail for federated users
avatarImage: richObject.server ? 'icon-user' : undefined,
displayName: richObject.name,
user: richObject.id,
url: richObject.link,
},
}

Copy link

cypress bot commented Aug 1, 2024



Test summary

8 2 0 0Flakiness 3


Run details

Project Activity
Status Failed
Commit 1a0a006
Started Aug 1, 2024 10:35 AM
Ended Aug 1, 2024 10:40 AM
Duration 05:01 💡
OS Linux Ubuntu -
Browser Electron 118

View run in Cypress Cloud ➡️


Failures

cypress/e2e/sidebar.cy.ts Failed
1 Check activity listing in the sidebar > Has favorite activity
2 Check activity listing in the sidebar > Has tag activity

Flakiness

sidebar.cy.ts Flakiness
1 Check activity listing in the sidebar > Has rename activity
2 Check activity listing in the sidebar > Has comment activity
settings.cy.ts Flakiness
1 Check that user's settings survive a reload > Form survive a reload

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Cloud

@nickvergessen nickvergessen merged commit 290e43f into master Aug 1, 2024
48 of 50 checks passed
@nickvergessen nickvergessen deleted the bugfix/noid/fix-federated-users branch August 1, 2024 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants