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

Add client-side custom filter support to glitch-soc

Browse Source 
Port cdb101340a to glitch-soc,
but without dropping support for regexp filters yet.
This commit is contained in:
Thibaut Girka
2018-07-08 20:04:53 +02:00
committed by ThibG
parent 33c1607c83
commit 0bb1720495
11 changed files with 119 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ const makeMapStateToProps = () => {
const getStatus = makeGetStatus();
const mapStateToProps = (state, props) => ({
status: getStatus(state, props.params.statusId),
status: getStatus(state, { id: props.params.statusId }),
settings: state.get('local_settings'),
ancestorsIds: state.getIn(['contexts', 'ancestors', props.params.statusId]),
descendantsIds: state.getIn(['contexts', 'descendants', props.params.statusId]),
@ -304,6 +304,7 @@ export default class Status extends ImmutablePureComponent {
expanded={this.state.threadExpanded}
onMoveUp={this.handleMoveUp}
onMoveDown={this.handleMoveDown}
contextType='thread'
/>
));
}

2
app/javascript/flavours/glitch/features/ui/index.js
View File

@ -11,6 +11,7 @@ import { debounce } from 'lodash';
import { uploadCompose, resetCompose } from 'flavours/glitch/actions/compose';
import { expandHomeTimeline } from 'flavours/glitch/actions/timelines';
import { expandNotifications } from 'flavours/glitch/actions/notifications';
import { fetchFilters } from 'flavours/glitch/actions/filters';
import { clearHeight } from 'flavours/glitch/actions/height_cache';
import { WrappedSwitch, WrappedRoute } from 'flavours/glitch/util/react_router_helpers';
import UploadArea from './components/upload_area';
@ -218,6 +219,7 @@ export default class UI extends React.Component {
this.props.dispatch(expandHomeTimeline());
this.props.dispatch(expandNotifications());
setTimeout(() => this.props.dispatch(fetchFilters()), 500);
}
componentDidMount () {