From d923cfa522c19ff7b533e64d4e00438196000246 Mon Sep 17 00:00:00 2001
From: Pavlos Smith <57727226+iByteABit256@users.noreply.github.com>
Date: Fri, 4 Aug 2023 23:32:07 +0300
Subject: [PATCH 1/3] Lemmy 2515 controversial posts and comments (#1727)

* Added buttons to be able to sort posts and comments by controversy rank

* Added buttons to be able to sort posts and comments by controversy rank

* lost changes

* Hiding controversial sort if downvotes disabled (unfinished)

* Finished hiding sort option correctly

* Removed newline

* Removed hiding logic for now, this should be included in a future PR

* woodpecker re-run

* woodpecker re-run

* woodpecker re-run

* Update lemmy js-client version

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
---
 package.json                                     |  2 +-
 .../components/common/comment-sort-select.tsx    |  3 +++
 src/shared/components/common/sort-select.tsx     |  3 +++
 src/shared/components/post/post.tsx              | 16 ++++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 27b9cb4f..8e3694b9 100644
--- a/package.json
+++ b/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",
diff --git a/src/shared/components/common/comment-sort-select.tsx b/src/shared/components/common/comment-sort-select.tsx
index ad4eebfe..f9115583 100644
--- a/src/shared/components/common/comment-sort-select.tsx
+++ b/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>
diff --git a/src/shared/components/common/sort-select.tsx b/src/shared/components/common/sort-select.tsx
index 088f45ed..fe9ba4d6 100644
--- a/src/shared/components/common/sort-select.tsx
+++ b/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 && [
diff --git a/src/shared/components/post/post.tsx b/src/shared/components/post/post.tsx
index 04012281..49e73486 100644
--- a/src/shared/components/post/post.tsx
+++ b/src/shared/components/post/post.tsx
@@ -478,6 +478,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"

From 76a656bc5b77e329d66551d2d2c7660dd3c469da Mon Sep 17 00:00:00 2001
From: "maxime.io" <maxime.de.visscher@gmail.com>
Date: Mon, 7 Aug 2023 14:39:44 +0200
Subject: [PATCH 2/3] Fix suggested title "&nbsp;" spaces (#2037)

* Fix imported title &nbsp spaces

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

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>

* Fix lint issue

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
---
 src/shared/components/post/post-form.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/shared/components/post/post-form.tsx b/src/shared/components/post/post-form.tsx
index 6c886286..7b379263 100644
--- a/src/shared/components/post/post-form.tsx
+++ b/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

From 61e0241d8930badc4a77cd973c3cbb64bd13c49e Mon Sep 17 00:00:00 2001
From: SleeplessOne1917 <abias1122@gmail.com>
Date: Mon, 7 Aug 2023 12:51:19 -0400
Subject: [PATCH 3/3] Fix password autocomplete (#2033)

---
 src/shared/components/common/password-input.tsx  | 4 +++-
 src/shared/components/home/setup.tsx             | 2 ++
 src/shared/components/home/signup.tsx            | 2 ++
 src/shared/components/person/password-change.tsx | 1 +
 src/shared/components/person/settings.tsx        | 6 ++++--
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/shared/components/common/password-input.tsx b/src/shared/components/common/password-input.tsx
index 42980089..20cbadd4 100644
--- a/src/shared/components/common/password-input.tsx
+++ b/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
diff --git a/src/shared/components/home/setup.tsx b/src/shared/components/home/setup.tsx
index 7dd433ab..0a3d09fe 100644
--- a/src/shared/components/home/setup.tsx
+++ b/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">
diff --git a/src/shared/components/home/signup.tsx b/src/shared/components/home/signup.tsx
index fce37f97..58324bef 100644
--- a/src/shared/components/home/signup.tsx
+++ b/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>
 
diff --git a/src/shared/components/person/password-change.tsx b/src/shared/components/person/password-change.tsx
index bfbeb716..16f23d4b 100644
--- a/src/shared/components/person/password-change.tsx
+++ b/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">
diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx
index 4b21d406..d0450470 100644
--- a/src/shared/components/person/settings.tsx
+++ b/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">