forked from treehouse/mastodon
Fix rake tasks and loading bar
parent
1cfc9aa20e
commit
a86f21cf90
|
@ -0,0 +1,8 @@
|
|||
import { connect } from 'react-redux';
|
||||
import LoadingBar from 'react-redux-loading-bar';
|
||||
|
||||
const mapStateToProps = (state) => ({
|
||||
loading: state.get('loadingBar')
|
||||
});
|
||||
|
||||
export default connect(mapStateToProps)(LoadingBar.WrappedComponent);
|
|
@ -8,7 +8,7 @@ import StatusListContainer from './containers/status_list_container';
|
|||
import NotificationsContainer from './containers/notifications_container';
|
||||
import NavigationContainer from './containers/navigation_container';
|
||||
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
||||
import LoadingBar from 'react-redux-loading-bar';
|
||||
import LoadingBarContainer from './containers/loading_bar_container';
|
||||
|
||||
const UI = React.createClass({
|
||||
|
||||
|
@ -46,7 +46,7 @@ const UI = React.createClass({
|
|||
</ColumnsArea>
|
||||
|
||||
<NotificationsContainer />
|
||||
<LoadingBar style={{ backgroundColor: '#2b90d9', left: '0', top: '0' }} />
|
||||
<LoadingBarContainer style={{ backgroundColor: '#2b90d9', left: '0', top: '0' }} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -13,6 +13,7 @@ namespace :mastodon do
|
|||
task clear: :environment do
|
||||
Account.remote.without_followers.find_each do |a|
|
||||
Rails.logger.debug "PuSH unsubscribing from #{a.acct}"
|
||||
begin
|
||||
a.subscription('').unsubscribe
|
||||
rescue HTTP::Error, OpenSSL::SSL::SSLError
|
||||
Rails.logger.debug "PuSH unsubscribing from #{a.acct} failed due to an HTTP or SSL error"
|
||||
|
@ -20,6 +21,7 @@ namespace :mastodon do
|
|||
a.update!(verify_token: '', secret: '', subscription_expires_at: nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
desc 'Re-subscribes to soon expiring PuSH subscriptions'
|
||||
task refresh: :environment do
|
||||
|
|
Loading…
Reference in New Issue