Skip to content

fix avatar and display name on direct conversation #218

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

Open
fvh-P wants to merge 2 commits into
base: imastodon
Choose a base branch
from
+1 −3
Open

fix avatar and display name on direct conversation #218

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb1457
fix avatar and display name on direct conversation
fvh-P May 28, 2019
6fd1f06
Update app/javascript/mastodon/components/status.js
fvh-P May 28, 2019
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
4 changes: 1 addition & 3 deletions app/javascript/mastodon/components/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,7 @@ class Status extends ImmutablePureComponent {
);
}

if (otherAccounts) {
statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />;
} else if (account === undefined || account === null) {
if (account === undefined || account === null) {
Comment thread
fvh-P marked this conversation as resolved.
Outdated
if (status.get('visibility') === 'public') {
statusAvatar = <Avatar account={status.get('account')} size={48} />;
} else {
Expand Down
⚡