1 files changed, 21 insertions, 1 deletions
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
index 637199686..4e40d73ef 100644
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -217,20 +217,34 @@ Container.propTypes = {
   children: PropTypes.node,
 };
 
-class Mastodon extends React.Component {
+class Mastodon extends React.PureComponent {
 
   componentDidMount() {
     const { locale }  = this.props;
     const streamingAPIBaseURL = store.getState().getIn(['meta', 'streaming_api_base_url']);
     const accessToken = store.getState().getIn(['meta', 'access_token']);
 
+    const setupPolling = () => {
+      this.polling = setInterval(() => {
+        store.dispatch(refreshTimeline('home'));
+        store.dispatch(refreshNotifications());
+      }, 20000);
+    };
+
+    const clearPolling = () => {
+      clearInterval(this.polling);
+      this.polling = undefined;
+    };
+
     this.subscription = createStream(streamingAPIBaseURL, accessToken, 'user', {
 
       connected () {
+        clearPolling();
         store.dispatch(connectTimeline('home'));
       },
 
       disconnected () {
+        setupPolling();
         store.dispatch(disconnectTimeline('home'));
       },
 
@@ -249,6 +263,7 @@ class Mastodon extends React.Component {
       },
 
       reconnected () {
+        clearPolling();
         store.dispatch(connectTimeline('home'));
         store.dispatch(refreshTimeline('home'));
         store.dispatch(refreshNotifications());
@@ -269,6 +284,11 @@ class Mastodon extends React.Component {
       this.subscription.close();
       this.subscription = null;
     }
+
+    if (typeof this.polling !== 'undefined') {
+      clearInterval(this.polling);
+      this.polling = null;
+    }
   }
 
   render () {