Merge pull request #4327 from withspectrum/2.4.75

2.4.75

Author: brianlovin

api/models/usersCommunities.js

@@ -693,7 +693,7 @@ export const getUsersTotalReputation = (userIds: Array<string>): Promise<Array<n
     .getAll(...userIds.map(userId => ([userId, true])), { index: 'userIdAndIsMember' })
     .group('userId')
     .map(rec => rec('reputation'))
-    .count()
+    .reduce((l, r) => l.add(r))
     .default(0)
     .run()
     .then(res =>

hyperion/renderer/browser-shim.js

@@ -20,4 +20,3 @@ global.navigator = {
 global.CSS = {
   escape: require('css.escape'),
 };
-global.IS_SERVER = true;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.4.74",
+  "version": "2.4.75",
   "license": "BSD-3-Clause",
   "devDependencies": {
     "@babel/preset-flow": "^7.0.0",

src/components/reputation/index.js

@@ -1,9 +1,9 @@
 // @flow
 import * as React from 'react';
 import { connect } from 'react-redux';
-import { openModal } from '../../actions/modals';
-import { truncateNumber } from '../../helpers/utils';
-import Icon from '../icons';
+import { openModal } from 'src/actions/modals';
+import { truncateNumber } from 'src/helpers/utils';
+import Icon from 'src/components/icons';
 import { ReputationWrapper, ReputationLabel } from './style';
 import type { Dispatch } from 'redux';
 

src/helpers/p-queue.js

@@ -1,7 +1,6 @@
 // @flow
 import * as React from 'react';
 import compose from 'recompose/compose';
-import PromiseQueue from './helpers/p-queue';
 import { Route, Switch, Redirect } from 'react-router';
 import styled, { ThemeProvider } from 'styled-components';
 import Loadable from 'react-loadable';
@@ -154,47 +153,6 @@ const ComposerFallback = signedOutFallback(Composer, () => (
   <Login redirectPath={`${CLIENT_URL}/new/thread`} />
 ));
 
-// On the client, preload the important routes when browser is idle and users has been using the app
-// for > 5s (i.e. all the data should hopefully have been loaded)
-if (!global || global.IS_SERVER !== true) {
-  const preload = [
-    FullscreenThreadView,
-    CommunityView,
-    CommunityLoginView,
-    UserView,
-    ChannelView,
-    Dashboard,
-    Notifications,
-  ];
-
-  requestAnimationFrame(() => {
-    // Fallback to setTimeout for older browsers with no requestIdleCallback support
-    const idle = window.requestIdleCallback || window.setTimeout;
-    const queue = new PromiseQueue({
-      concurrency: 2,
-    });
-    idle(() => {
-      // Wait 5 seconds to make sure the data has loaded
-      setTimeout(() => {
-        preload.forEach(bundle => {
-          queue
-            .add(() => {
-              return new Promise(res => {
-                idle(() => {
-                  bundle
-                    .preload()
-                    .then(res)
-                    .catch(err => console.error(err));
-                });
-              });
-            })
-            .catch(err => console.error(err));
-        });
-      }, 5000);
-    });
-  });
-}
-
 type Props = {
   currentUser: ?GetUserType,
   isLoadingCurrentUser: boolean,

src/routes.js

@@ -94,28 +94,6 @@ class ThreadFeed extends React.Component<Props, State> {
     }
   };
 
-  // Select the first thread on SSR if none is selected
-  componentWillMount() {
-    const { mountedWithActiveThread } = this.props;
-
-    if (
-      mountedWithActiveThread ||
-      this.props.selectedId ||
-      !this.props.data.threads
-    )
-      return;
-
-    const threadNodes = this.props.data.threads
-      .slice()
-      .map(thread => thread && thread.node);
-    const sortedThreadNodes = sortByDate(threadNodes, 'lastActive', 'desc');
-    const hasFirstThread = sortedThreadNodes.length > 0;
-    const firstThreadId = hasFirstThread ? sortedThreadNodes[0].id : '';
-    if (hasFirstThread) {
-      this.props.history.replace(`/?t=${firstThreadId}`);
-    }
-  }
-
   componentDidUpdate(prevProps) {
     const isDesktop = window.innerWidth > 768;
     const { scrollElement } = this.state;

src/views/dashboard/components/threadFeed.js

@@ -10,6 +10,7 @@ import NotificationsTab from './components/notificationsTab';
 import Head from 'src/components/head';
 import { withCurrentUser } from 'src/components/withCurrentUser';
 import type { GetUserType } from 'shared/graphql/queries/user/getUser';
+import { truncateNumber } from 'src/helpers/utils';
 import {
   Nav,
   Logo,
@@ -233,11 +234,16 @@ class Navbar extends React.Component<Props, State> {
               to={currentUser ? `/users/${currentUser.username}` : '/'}
               onClick={() => this.trackNavigationClick('profile')}
             >
-              {currentUser && (
-                <Reputation>
-                  <Icon glyph="rep" /> {currentUser.totalReputation}
-                </Reputation>
-              )}
+              {currentUser &&
+                typeof currentUser.totalReputation === 'number' && (
+                  <Reputation>
+                    <Icon glyph="rep" />{' '}
+                    {truncateNumber(
+                      parseInt(currentUser.totalReputation, 10),
+                      1
+                    )}
+                  </Reputation>
+                )}
               <Navatar
                 style={{ gridArea: 'label' }}
                 user={currentUser}