Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)

Browse source 
* Migrate to newer version of Font Awesome

* Add bot icon to bot avatars
This commit is contained in:
Maciek Baron 2018-09-25 04:08:55 +01:00 • committed by Eugen Rochko
parent 8864009e8d
commit 4b794e134d
9 changed files with 66 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.js.snap
View file

@ -13,7 +13,11 @@ exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
"width": "100px",
}
}
/>
>
<i
className="fa fa-fw fa-robot bot-icon"
/>
</div>
`;
exports[`<Avatar /> Still renders a still avatar 1`] = `
@ -29,5 +33,9 @@ exports[`<Avatar /> Still renders a still avatar 1`] = `
"width": "100px",
}
}
/>
>
<i
className="fa fa-fw fa-robot bot-icon"
/>
</div>
`;

1
app/javascript/mastodon/components/__tests__/avatar-test.js
View file

@ -10,6 +10,7 @@ describe('<Avatar />', () => {
display_name: 'Alice',
avatar: '/animated/alice.gif',
avatar_static: '/static/alice.jpg',
bot: true,
});
const size = 100;

5
app/javascript/mastodon/components/avatar.js
View file

@ -1,6 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import BotIcon from './bot_icon';
import { autoPlayGif } from '../initial_state';
export default class Avatar extends React.PureComponent {
@ -65,7 +66,9 @@ export default class Avatar extends React.PureComponent {
onMouseEnter={this.handleMouseEnter}
onMouseLeave={this.handleMouseLeave}
style={style}
/>
>
<BotIcon account={account} />
</div>
);
}

23
app/javascript/mastodon/components/bot_icon.js Normal file
View file

@ -0,0 +1,23 @@
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
export default class BotIcon extends ImmutablePureComponent {
static propTypes = {
account: ImmutablePropTypes.map.isRequired,
};
render () {
const { account } = this.props;
if (account.get('bot')) {
return (
<i className='fa fa-fw fa-robot bot-icon' />
);
}
return '';
}
}