Merge branch 'main' into fix_comment_tree_replacing

package.json

@@ -67,7 +67,7 @@
     "inferno-router": "^8.2.2",
     "inferno-server": "^8.2.2",
     "jwt-decode": "^3.1.2",
-    "lemmy-js-client": "0.18.1",
+    "lemmy-js-client": "0.19.0-rc.1",
     "lodash.isequal": "^4.5.0",
     "markdown-it": "^13.0.1",
     "markdown-it-container": "^3.0.0",

src/shared/components/common/comment-sort-select.tsx

@@ -48,6 +48,9 @@ export class CommentSortSelect extends Component<
             {I18NextService.i18n.t("sort_type")}
           </option>
           <option value={"Hot"}>{I18NextService.i18n.t("hot")}</option>,
+          <option value={"Controversial"}>
+            {I18NextService.i18n.t("controversial")}
+          </option>
           <option value={"Top"}>{I18NextService.i18n.t("top")}</option>,
           <option value={"New"}>{I18NextService.i18n.t("new")}</option>
           <option value={"Old"}>{I18NextService.i18n.t("old")}</option>

src/shared/components/common/password-input.tsx

@@ -14,6 +14,7 @@ interface PasswordInputProps {
   showStrength?: boolean;
   label?: string | null;
   showForgotLink?: boolean;
+  isNew?: boolean;
 }
 
 interface PasswordInputState {
@@ -73,6 +74,7 @@ class PasswordInput extends Component<PasswordInputProps, PasswordInputState> {
         showStrength,
         label,
         showForgotLink,
+        isNew,
       },
       state: { show },
     } = this;
@@ -91,7 +93,7 @@ class PasswordInput extends Component<PasswordInputProps, PasswordInputState> {
                 type={show ? "text" : "password"}
                 className="form-control"
                 aria-describedby={id}
-                autoComplete="on"
+                autoComplete={isNew ? "new-password" : "current-password"}
                 onInput={onInput}
                 value={value}
                 required

src/shared/components/common/sort-select.tsx

@@ -54,6 +54,9 @@ export class SortSelect extends Component<SortSelectProps, SortSelectState> {
               {I18NextService.i18n.t("active")}
             </option>,
           ]}
+          <option value={"Controversial"}>
+            {I18NextService.i18n.t("controversial")}
+          </option>
           <option value={"New"}>{I18NextService.i18n.t("new")}</option>
           <option value={"Old"}>{I18NextService.i18n.t("old")}</option>
           {!this.props.hideMostComments && [

src/shared/components/home/setup.tsx

@@ -128,6 +128,7 @@ export class Setup extends Component<any, State> {
             value={this.state.form.password}
             onInput={linkEvent(this, this.handleRegisterPasswordChange)}
             label={I18NextService.i18n.t("password")}
+            isNew
           />
         </div>
         <div className="mb-3">
@@ -136,6 +137,7 @@ export class Setup extends Component<any, State> {
             value={this.state.form.password_verify}
             onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)}
             label={I18NextService.i18n.t("verify_password")}
+            isNew
           />
         </div>
         <div className="mb-3 row">

src/shared/components/home/signup.tsx

@@ -189,6 +189,7 @@ export class Signup extends Component<any, State> {
             onInput={linkEvent(this, this.handleRegisterPasswordChange)}
             showStrength
             label={I18NextService.i18n.t("password")}
+            isNew
           />
         </div>
 
@@ -198,6 +199,7 @@ export class Signup extends Component<any, State> {
             value={this.state.form.password_verify}
             onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)}
             label={I18NextService.i18n.t("verify_password")}
+            isNew
           />
         </div>
 

src/shared/components/person/password-change.tsx

@@ -68,6 +68,7 @@ export class PasswordChange extends Component<any, State> {
             onInput={linkEvent(this, this.handlePasswordChange)}
             showStrength
             label={I18NextService.i18n.t("new_password")}
+            isNew
           />
         </div>
         <div className="mb-3">

src/shared/components/person/settings.tsx

@@ -264,7 +264,7 @@ export class Settings extends Component<any, SettingsState> {
     );
   }
 
-  userSettings(isSelected) {
+  userSettings(isSelected: boolean) {
     return (
       <div
         className={classNames("tab-pane show", {
@@ -289,7 +289,7 @@ export class Settings extends Component<any, SettingsState> {
     );
   }
 
-  blockCards(isSelected) {
+  blockCards(isSelected: boolean) {
     return (
       <div
         className={classNames("tab-pane", {
@@ -326,6 +326,7 @@ export class Settings extends Component<any, SettingsState> {
               onInput={linkEvent(this, this.handleNewPasswordChange)}
               showStrength
               label={I18NextService.i18n.t("new_password")}
+              isNew
             />
           </div>
           <div className="mb-3">
@@ -334,6 +335,7 @@ export class Settings extends Component<any, SettingsState> {
               value={this.state.changePasswordForm.new_password_verify}
               onInput={linkEvent(this, this.handleNewPasswordVerifyChange)}
               label={I18NextService.i18n.t("verify_password")}
+              isNew
             />
           </div>
           <div className="mb-3">

src/shared/components/post/post-form.tsx

@@ -582,8 +582,10 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
       case "loading":
         return <Spinner />;
       case "success": {
-        const suggestedTitle = this.state.metadataRes.data.metadata.title;
+        // Clean up the title of any extra whitespace and replace &nbsp; with a space
-
+        const suggestedTitle = this.state.metadataRes.data.metadata.title
+          ?.trim()
+          .replace(/\s+/g, " ");
         return (
           suggestedTitle && (
             <button

src/shared/components/post/post.tsx

@@ -482,6 +482,22 @@ export class Post extends Component<any, PostState> {
           >
             {I18NextService.i18n.t("top")}
           </label>
+          <input
+            id={`${radioId}-controversial`}
+            type="radio"
+            className="btn-check"
+            value={"Controversial"}
+            checked={this.state.commentSort === "Controversial"}
+            onChange={linkEvent(this, this.handleCommentSortChange)}
+          />
+          <label
+            htmlFor={`${radioId}-controversial`}
+            className={classNames("btn btn-outline-secondary pointer", {
+              active: this.state.commentSort === "Controversial",
+            })}
+          >
+            {I18NextService.i18n.t("controversial")}
+          </label>
           <input
             id={`${radioId}-new`}
             type="radio"