fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-24 09:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rake tasks and loading bar

Browse source
This commit is contained in:
Eugen Rochko 2016-09-20 01:53:30 +02:00
parent 1cfc9aa20e
commit a86f21cf90
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/components/features/ui/containers/loading_bar_container.jsx Normal file
View file

@ -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);

4
app/assets/javascripts/components/features/ui/index.jsx
View file

@ -8,7 +8,7 @@ import StatusListContainer from './containers/status_list_container';
import NotificationsContainer from './containers/notifications_container'; import NotificationsContainer from './containers/notifications_container';
import NavigationContainer from './containers/navigation_container'; import NavigationContainer from './containers/navigation_container';
import PureRenderMixin from 'react-addons-pure-render-mixin'; 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({ const UI = React.createClass({
@ -46,7 +46,7 @@ const UI = React.createClass({
</ColumnsArea> </ColumnsArea>
<NotificationsContainer /> <NotificationsContainer />
<LoadingBar style={{ backgroundColor: '#2b90d9', left: '0', top: '0' }} /> <LoadingBarContainer style={{ backgroundColor: '#2b90d9', left: '0', top: '0' }} />
</div> </div>
); );
} }

12
lib/tasks/mastodon.rake
View file

@ -13,11 +13,13 @@ namespace :mastodon do
task clear: :environment do task clear: :environment do
Account.remote.without_followers.find_each do |a| Account.remote.without_followers.find_each do |a|
Rails.logger.debug "PuSH unsubscribing from #{a.acct}" Rails.logger.debug "PuSH unsubscribing from #{a.acct}"
a.subscription('').unsubscribe begin
rescue HTTP::Error, OpenSSL::SSL::SSLError a.subscription('').unsubscribe
Rails.logger.debug "PuSH unsubscribing from #{a.acct} failed due to an HTTP or SSL error" rescue HTTP::Error, OpenSSL::SSL::SSLError
ensure Rails.logger.debug "PuSH unsubscribing from #{a.acct} failed due to an HTTP or SSL error"
a.update!(verify_token: '', secret: '', subscription_expires_at: nil) ensure
a.update!(verify_token: '', secret: '', subscription_expires_at: nil)
end
end end
end end