tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regexp filtering in pinned community/public TLs (#1840)

Browse Source
This commit is contained in:
Claire
2022-09-02 11:57:06 +02:00
committed by GitHub
parent d4e63cd980
commit 2a46fcc3ed
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/features/home_timeline/index.js
View File

@ -26,6 +26,7 @@ const mapStateToProps = state => ({
hasAnnouncements: !state.getIn(['announcements', 'items']).isEmpty(),
unreadAnnouncements: state.getIn(['announcements', 'items']).count(item => !item.get('read')),
showAnnouncements: state.getIn(['announcements', 'show']),
regex: state.getIn(['settings', 'home', 'regex', 'body']),
});
export default @connect(mapStateToProps)
@ -42,6 +43,7 @@ class HomeTimeline extends React.PureComponent {
hasAnnouncements: PropTypes.bool,
unreadAnnouncements: PropTypes.number,
showAnnouncements: PropTypes.bool,
regex: PropTypes.string,
};
handlePin = () => {
@ -154,6 +156,7 @@ class HomeTimeline extends React.PureComponent {
timelineId='home'
emptyMessage={<FormattedMessage id='empty_column.home' defaultMessage='Your home timeline is empty! Follow more people to fill it up. {suggestions}' values={{ suggestions: <Link to='/start'><FormattedMessage id='empty_column.home.suggestions' defaultMessage='See some suggestions' /></Link> }} />}
bindToDocument={!multiColumn}
regex={this.props.regex}
/>
</Column>
);