Patch route user (steemit#883)

* Tweak translate setting for followed/follower count * Remove un-needed setting, refactor match for existing regex setting covering needs
nuagnorab · Dec 21, 2016 · 86797ee · 86797ee
1 parent ac51da9
commit 86797ee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/app/ResolveRoute.js b/app/ResolveRoute.js
@@ -2,7 +2,6 @@ export const routeRegex = {
     PostsIndex: /^\/(@[\w\.\d-]+)\/feed\/?$/,
     UserProfile1: /^\/(@[\w\.\d-]+)\/?$/,
     UserProfile2: /^\/(@[\w\.\d-]+)\/(blog|posts|comments|recommended|transfers|curation-rewards|author-rewards|permissions|created|recent-replies|feed|password|followed|followers|settings)\/?$/,
-    UserRoute: /^(@[\w\.\d//-]+)/,
     UserEndPoints: /^(blog|posts|comments|recommended|transfers|curation-rewards|author-rewards|permissions|created|recent-replies|feed|password|followed|followers|settings)$/,
     CategoryFilters: /^\/(hot|created|trending|active|promoted)\/?$/ig,
     PostNoCategory: /^\/(@[\w\.\d-]+)\/([\w\d-]+)/,

diff --git a/app/components/pages/UserProfile.jsx b/app/components/pages/UserProfile.jsx
@@ -396,11 +396,11 @@ export default class UserProfile extends React.Component {
                             {about && <p className="UserProfile__bio">{about}</p>}
                             <div className="UserProfile__stats">
                                 <span>
-                                    <Link to={`/@${accountname}/followers`}>{followerCount ? translate('follower_count', {followerCount}) : translate('followers')}</Link>
+                                    <Link to={`/@${accountname}/followers`}>{translate('follower_count', {followerCount})}</Link>
                                     {isMyAccount && <NotifiCounter fields="follow" />}
                                 </span>
                                 <span><Link to={`/@${accountname}`}>{translate('post_count', {postCount: account.post_count || 0})}</Link></span>
-                                <span><Link to={`/@${accountname}/followed`}>{followingCount ? translate('followed_count', {followingCount}) : translate('following')}</Link></span>
+                                <span><Link to={`/@${accountname}/followed`}>{translate('followed_count', {followingCount})}</Link></span>
                             </div>
                             <p className="UserProfile__info">
                                 {location && <span><Icon name="location" /> {location}</span>}

diff --git a/server/server.js b/server/server.js
@@ -59,7 +59,7 @@ app.use(function *(next) {
         }
     }
     // // handle non-existing users endpoints with 404
-    if (this.method === 'GET' && routeRegex.UserRoute.test(this.url)) {
+    if (this.method === 'GET' && routeRegex.PostNoCategory.test(this.url)) {
         const segments = this.url.split('/');
         if(segments[2] && !routeRegex.UserEndPoints.test(segments[2])) {
             this.status = 404;