Merge pull request #594 from CPSSD/a/fixroguefollowbutton

Fix a few random small bugs
CPSSD · Apr 17, 2019 · f0cf0f7 · f0cf0f7
2 parents 4bda091 + 67dd10a
commit f0cf0f7
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 15 deletions.
diff --git a/chump/rabble_config.json b/chump/rabble_config.json
@@ -60,5 +60,16 @@
   "denied_follow": "Follow denied",
   "read_more_text": "Read more",
   "reblog_success": "Post reblogged",
-  "incorrect_credentials": "Incorrect credentials"
+  "incorrect_credentials": "Incorrect credentials",
+  "profile": "Profile",
+  "follow_nav": "Follow",
+  "like": "Like",
+  "unlike": "Unlike",
+  "reblog": "Reblog",
+  "reblogged": "Reblogged",
+  "add_tag": "Add a tag",
+  "blank_fields": "Blank fields are left unchanged",
+  "current_password": "Enter your current password",
+  "custom_css": "Custom CSS",
+  "edit": "Edit"
 }
diff --git a/chump/src/components/account_edit.tsx b/chump/src/components/account_edit.tsx
@@ -127,7 +127,7 @@ export class AccountEdit extends RootComponent<IAccountEditProps, IAccountEditSt
           onSubmit={this.handleUpdate}
         >
           <fieldset>
-            <legend>Blank fields are left unchanged</legend>
+            <legend>{config.blank_fields}</legend>
             <div className="pure-control-group">
                 <label htmlFor="newPassword">{config.new_password}</label>
                 <input
@@ -170,7 +170,7 @@ export class AccountEdit extends RootComponent<IAccountEditProps, IAccountEditSt
                 />
             </div>
             <div className="pure-control-group">
-                <label htmlFor="name">{"Custom CSS"}</label>
+                <label htmlFor="name">{config.custom_css}</label>
                 <textarea
                   id="custom_css"
                   placeholder=".article-title { color: red }"
@@ -191,7 +191,7 @@ export class AccountEdit extends RootComponent<IAccountEditProps, IAccountEditSt
               />
             </div>
 
-            <legend>Enter your current user account</legend>
+            <legend>{config.current_password}</legend>
             <div className="pure-control-group">
                 <label htmlFor="name">{config.password}</label>
                 <input

diff --git a/chump/src/components/create_article_form.tsx b/chump/src/components/create_article_form.tsx
@@ -158,6 +158,7 @@ export class CreateArticleForm extends RootComponent<IFormProps, IFormState> {
               onChange={this.handleTagInputChange}
               onlyUnique={true}
               maxTags={7}
+              inputProps={{ className: "react-tagsinput-input", placeholder: config.add_tag }}
             />
             <textarea
               name="blogText"

diff --git a/chump/src/components/edit_button.tsx b/chump/src/components/edit_button.tsx
@@ -40,7 +40,7 @@ export class EditButton extends RootComponent<IEditProps, IEditState> {
           className="pure-button pure-input-1-3 pure-button-primary primary-button"
           onClick={this.handleEdit}
         >
-          <Edit/> Edit
+          <Edit/> {config.edit}
         </button>
       </div>
     );

diff --git a/chump/src/components/follow_button.tsx b/chump/src/components/follow_button.tsx
@@ -57,9 +57,13 @@ export class FollowButton extends RootComponent<IFormProps, IFormState> {
   }
 
   public render() {
-    const sameUser = (this.props.follower === this.props.followed &&
-                      this.props.followed_host === "");
-    if (this.props.follower === "" || sameUser) {
+    const noFollower = (typeof this.props.follower === "undefined" ||
+                        this.props.follower === "");
+
+    const noHost =  (typeof this.props.followed_host === "undefined" ||
+                     this.props.followed_host === "");
+
+    if (noFollower || (this.props.follower === this.props.followed && noHost)) {
         return null;
     }
     return (

diff --git a/chump/src/components/header.tsx b/chump/src/components/header.tsx
@@ -140,7 +140,7 @@ class Header extends React.Component<IHeaderProps, IHeaderState> {
         </li>
         <li className="pure-menu-item">
           <Link to="/follow" className="pure-menu-link nav-action">
-            <UserPlus size="1em"/> {config.follow_text}
+            <UserPlus size="1em"/> {config.follow_nav}
           </Link>
         </li>
       </ul>
@@ -173,7 +173,7 @@ class Header extends React.Component<IHeaderProps, IHeaderState> {
         <ul id="dropdown" className="menu-dropdown pure-menu-children" style={{display: this.state.display}}>
           <li className="pure-menu-item">
             <Link to={`/@${this.props.username}`} className="pure-menu-link" onClick={this.resetDropdown}>
-              Profile
+              {config.profile}
             </Link>
           </li>
           <li className="pure-menu-item">

diff --git a/chump/src/components/like_button.tsx b/chump/src/components/like_button.tsx
@@ -50,7 +50,7 @@ export class LikeButton extends RootComponent<ILikeButtonProps, ILikeButtonState
         className="pure-button pure-input-1-3 pure-button-primary primary-button"
         onClick={this.handleClick}
       >
-        {this.state.likesCount} <ThumbsUp/> Like
+        {this.state.likesCount} <ThumbsUp/> {config.like}
       </button>
     );
   }
@@ -61,7 +61,7 @@ export class LikeButton extends RootComponent<ILikeButtonProps, ILikeButtonState
         className="pure-button pure-input-1-3 pure-button-primary primary-button"
         onClick={this.handleClick}
       >
-        {this.state.likesCount} <ThumbsUp/> Unlike
+        {this.state.likesCount} <ThumbsUp/> {config.unlike}
       </button>
     );
   }

diff --git a/chump/src/components/reblog_button.tsx b/chump/src/components/reblog_button.tsx
@@ -63,7 +63,7 @@ export class Reblog extends RootComponent<IReblogProps, IReblogState> {
         type="submit"
         className="pure-button pure-button-primary primary-button"
       >
-        {this.state.sharesCount} <Repeat size="1em"/> Reblog
+        {this.state.sharesCount} <Repeat size="1em"/> {config.reblog}
       </button>
     );
   }
@@ -75,7 +75,7 @@ export class Reblog extends RootComponent<IReblogProps, IReblogState> {
         className="pure-button pure-button-primary primary-button"
         disabled={true}
       >
-        {this.state.sharesCount} <Repeat size="1em"/> | Reblogged
+        {this.state.sharesCount} <Repeat size="1em"/> | {config.reblogged}
       </button>
     );
   }

diff --git a/services/utils/users.py b/services/utils/users.py
@@ -56,7 +56,9 @@ def parse_actor_details(self, actor_uri):
             self._logger.warning(f'No actor doc found for user {actor_uri}.')
             return None, None, None
         handle = actor_doc['preferredUsername']
-        summary = actor_doc['summary']
+        summary = ""
+        if 'summary' in actor_doc:
+            summary = actor_doc['summary']
         host = self._activ_util.normalise_hostname(urlparse(actor_uri).netloc)
         return host, handle, summary