From ba5cafef08a293674d7e585ba7617e3fc74c9014 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sun, 25 Jun 2023 18:01:25 -0400
Subject: [PATCH 1/8] chore: Separate post mod buttons into functions

---
 src/shared/components/post/post-listing.tsx | 368 +++++++++++---------
 1 file changed, 204 insertions(+), 164 deletions(-)

diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 76a3e445..76690986 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -718,6 +718,94 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             {(this.canMod_ || this.canAdmin_) && (
               <li>{this.modRemoveButton}</li>
             )}
+
+            {this.canMod_ && (
+              <>
+                {!this.creatorIsMod_ &&
+                  (!post_view.creator_banned_from_community ? (
+                    <li>{this.modBanFromCommunityButton}</li>
+                  ) : (
+                    <li>{this.modUnbanFromCommunityButton}</li>
+                  ))}
+                {!post_view.creator_banned_from_community && (
+                  <li>{this.addModToCommunityButton}</li>
+                )}
+              </>
+            )}
+
+            {/* Community creators and admins can transfer community to another mod */}
+            {(amCommunityCreator(post_view.creator.id, this.props.moderators) ||
+              this.canAdmin_) &&
+              this.creatorIsMod_ &&
+              (!this.state.showConfirmTransferCommunity ? (
+                <li>
+                  <button
+                    className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                    onClick={linkEvent(
+                      this,
+                      this.handleShowConfirmTransferCommunity
+                    )}
+                    aria-label={I18NextService.i18n.t("transfer_community")}
+                  >
+                    {I18NextService.i18n.t("transfer_community")}
+                  </button>
+                </li>
+              ) : (
+                <>
+                  <li>
+                    <button
+                      className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                      aria-label={I18NextService.i18n.t("are_you_sure")}
+                    >
+                      {I18NextService.i18n.t("are_you_sure")}
+                    </button>
+                  </li>
+                  <li>
+                    <button
+                      className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                      aria-label={I18NextService.i18n.t("yes")}
+                      onClick={linkEvent(this, this.handleTransferCommunity)}
+                    >
+                      {this.state.transferLoading ? (
+                        <Spinner />
+                      ) : (
+                        I18NextService.i18n.t("yes")
+                      )}
+                    </button>
+                  </li>
+                  <li>
+                    <button
+                      className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                      onClick={linkEvent(
+                        this,
+                        this.handleCancelShowConfirmTransferCommunity
+                      )}
+                      aria-label={I18NextService.i18n.t("no")}
+                    >
+                      {I18NextService.i18n.t("no")}
+                    </button>
+                  </li>
+                </>
+              ))}
+            {/* Admins can ban from all, and appoint other admins */}
+            {this.canAdmin_ && (
+              <>
+                {!this.creatorIsAdmin_ && (
+                  <>
+                    {!isBanned(post_view.creator) ? (
+                      <li>{modBanButton}</li>
+                    ) : (
+                      <li>{modUnbanButton}</li>
+                    )}
+                    <li>{purgePersonButton}</li>
+                    <li>{purgePostButton}</li>
+                  </>
+                )}
+                {!isBanned(post_view.creator) && post_view.creator.local && (
+                  <li>{toggleAdminButton}</li>
+                )}
+              </>
+            )}
           </ul>
         </div>
       </>
@@ -982,6 +1070,121 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
     );
   }
 
+  get modBanFromCommunityButton() {
+    return (
+      <button
+        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        onClick={linkEvent(this, this.handleModBanFromCommunityShow)}
+        aria-label={I18NextService.i18n.t("ban_from_community")}
+      >
+        {I18NextService.i18n.t("ban_from_community")}
+      </button>
+    );
+  }
+
+  get modUnbanFromCommunityButton() {
+    return (
+      <button
+        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        onClick={linkEvent(this, this.handleModBanFromCommunitySubmit)}
+        aria-label={I18NextService.i18n.t("unban")}
+      >
+        {this.state.banLoading ? <Spinner /> : I18NextService.i18n.t("unban")}
+      </button>
+    );
+  }
+
+  get addModToCommunityButton() {
+    return (
+      <button
+        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        onClick={linkEvent(this, this.handleAddModToCommunity)}
+        aria-label={
+          this.creatorIsMod_
+            ? I18NextService.i18n.t("remove_as_mod")
+            : I18NextService.i18n.t("appoint_as_mod")
+        }
+      >
+        {this.state.addModLoading ? (
+          <Spinner />
+        ) : this.creatorIsMod_ ? (
+          I18NextService.i18n.t("remove_as_mod")
+        ) : (
+          I18NextService.i18n.t("appoint_as_mod")
+        )}
+      </button>
+    );
+  }
+
+  get modBanButton() {
+    return (
+      <button
+        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        onClick={linkEvent(this, this.handleModBanShow)}
+        aria-label={I18NextService.i18n.t("ban_from_site")}
+      >
+        {I18NextService.i18n.t("ban_from_site")}
+      </button>
+    );
+  }
+
+  get modUnbanButton() {
+    return (
+      <button
+        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        onClick={linkEvent(this, this.handleModBanSubmit)}
+        aria-label={I18NextService.i18n.t("unban_from_site")}
+      >
+        {this.state.banLoading ? (
+          <Spinner />
+        ) : (
+          I18NextService.i18n.t("unban_from_site")
+        )}
+      </button>
+    );
+  }
+
+  get purgePersonButton() {
+    return (
+      <button
+        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        onClick={linkEvent(this, this.handlePurgePersonShow)}
+        aria-label={I18NextService.i18n.t("purge_user")}
+      >
+        {I18NextService.i18n.t("purge_user")}
+      </button>
+    );
+  }
+
+  get purgePostButton() {
+    return (
+      <button
+        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        onClick={linkEvent(this, this.handlePurgePostShow)}
+        aria-label={I18NextService.i18n.t("purge_post")}
+      >
+        {I18NextService.i18n.t("purge_post")}
+      </button>
+    );
+  }
+
+  get toggleAdminButton() {
+    return (
+      <button
+        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        onClick={linkEvent(this, this.handleAddAdmin)}
+      >
+        {this.state.addAdminLoading ? (
+          <Spinner />
+        ) : this.creatorIsAdmin_ ? (
+          I18NextService.i18n.t("remove_as_admin")
+        ) : (
+          I18NextService.i18n.t("appoint_as_admin")
+        )}
+      </button>
+    );
+  }
+
   get modRemoveButton() {
     const removed = this.postView.post.removed;
     return (
@@ -1011,170 +1214,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
     // TODO: make nicer
     const post_view = this.postView;
     return (
-      this.state.showAdvanced && (
-        <div className="mt-3">
-          {this.canMod_ && (
-            <>
-              {!this.creatorIsMod_ &&
-                (!post_view.creator_banned_from_community ? (
-                  <button
-                    className="btn btn-link btn-animate text-muted py-0"
-                    onClick={linkEvent(
-                      this,
-                      this.handleModBanFromCommunityShow
-                    )}
-                    aria-label={I18NextService.i18n.t("ban_from_community")}
-                  >
-                    {I18NextService.i18n.t("ban_from_community")}
-                  </button>
-                ) : (
-                  <button
-                    className="btn btn-link btn-animate text-muted py-0"
-                    onClick={linkEvent(
-                      this,
-                      this.handleModBanFromCommunitySubmit
-                    )}
-                    aria-label={I18NextService.i18n.t("unban")}
-                  >
-                    {this.state.banLoading ? (
-                      <Spinner />
-                    ) : (
-                      I18NextService.i18n.t("unban")
-                    )}
-                  </button>
-                ))}
-              {!post_view.creator_banned_from_community && (
-                <button
-                  className="btn btn-link btn-animate text-muted py-0"
-                  onClick={linkEvent(this, this.handleAddModToCommunity)}
-                  aria-label={
-                    this.creatorIsMod_
-                      ? I18NextService.i18n.t("remove_as_mod")
-                      : I18NextService.i18n.t("appoint_as_mod")
-                  }
-                >
-                  {this.state.addModLoading ? (
-                    <Spinner />
-                  ) : this.creatorIsMod_ ? (
-                    I18NextService.i18n.t("remove_as_mod")
-                  ) : (
-                    I18NextService.i18n.t("appoint_as_mod")
-                  )}
-                </button>
-              )}
-            </>
-          )}
-          {/* Community creators and admins can transfer community to another mod */}
-          {(amCommunityCreator(post_view.creator.id, this.props.moderators) ||
-            this.canAdmin_) &&
-            this.creatorIsMod_ &&
-            (!this.state.showConfirmTransferCommunity ? (
-              <button
-                className="btn btn-link btn-animate text-muted py-0"
-                onClick={linkEvent(
-                  this,
-                  this.handleShowConfirmTransferCommunity
-                )}
-                aria-label={I18NextService.i18n.t("transfer_community")}
-              >
-                {I18NextService.i18n.t("transfer_community")}
-              </button>
-            ) : (
-              <>
-                <button
-                  className="d-inline-block me-1 btn btn-link btn-animate text-muted py-0"
-                  aria-label={I18NextService.i18n.t("are_you_sure")}
-                >
-                  {I18NextService.i18n.t("are_you_sure")}
-                </button>
-                <button
-                  className="btn btn-link btn-animate text-muted py-0 d-inline-block me-1"
-                  aria-label={I18NextService.i18n.t("yes")}
-                  onClick={linkEvent(this, this.handleTransferCommunity)}
-                >
-                  {this.state.transferLoading ? (
-                    <Spinner />
-                  ) : (
-                    I18NextService.i18n.t("yes")
-                  )}
-                </button>
-                <button
-                  className="btn btn-link btn-animate text-muted py-0 d-inline-block"
-                  onClick={linkEvent(
-                    this,
-                    this.handleCancelShowConfirmTransferCommunity
-                  )}
-                  aria-label={I18NextService.i18n.t("no")}
-                >
-                  {I18NextService.i18n.t("no")}
-                </button>
-              </>
-            ))}
-          {/* Admins can ban from all, and appoint other admins */}
-          {this.canAdmin_ && (
-            <>
-              {!this.creatorIsAdmin_ && (
-                <>
-                  {!isBanned(post_view.creator) ? (
-                    <button
-                      className="btn btn-link btn-animate text-muted py-0"
-                      onClick={linkEvent(this, this.handleModBanShow)}
-                      aria-label={I18NextService.i18n.t("ban_from_site")}
-                    >
-                      {I18NextService.i18n.t("ban_from_site")}
-                    </button>
-                  ) : (
-                    <button
-                      className="btn btn-link btn-animate text-muted py-0"
-                      onClick={linkEvent(this, this.handleModBanSubmit)}
-                      aria-label={I18NextService.i18n.t("unban_from_site")}
-                    >
-                      {this.state.banLoading ? (
-                        <Spinner />
-                      ) : (
-                        I18NextService.i18n.t("unban_from_site")
-                      )}
-                    </button>
-                  )}
-                  <button
-                    className="btn btn-link btn-animate text-muted py-0"
-                    onClick={linkEvent(this, this.handlePurgePersonShow)}
-                    aria-label={I18NextService.i18n.t("purge_user")}
-                  >
-                    {I18NextService.i18n.t("purge_user")}
-                  </button>
-                  <button
-                    className="btn btn-link btn-animate text-muted py-0"
-                    onClick={linkEvent(this, this.handlePurgePostShow)}
-                    aria-label={I18NextService.i18n.t("purge_post")}
-                  >
-                    {I18NextService.i18n.t("purge_post")}
-                  </button>
-                </>
-              )}
-              {!isBanned(post_view.creator) && post_view.creator.local && (
-                <button
-                  className="btn btn-link btn-animate text-muted py-0"
-                  onClick={linkEvent(this, this.handleAddAdmin)}
-                  aria-label={
-                    this.creatorIsAdmin_
-                      ? I18NextService.i18n.t("remove_as_admin")
-                      : I18NextService.i18n.t("appoint_as_admin")
-                  }
-                >
-                  {this.state.addAdminLoading ? (
-                    <Spinner />
-                  ) : this.creatorIsAdmin_ ? (
-                    I18NextService.i18n.t("remove_as_admin")
-                  ) : (
-                    I18NextService.i18n.t("appoint_as_admin")
-                  )}
-                </button>
-              )}
-            </>
-          )}
-        </div>
-      )
+      this.state.showAdvanced && <div className="mt-3 user-actions-line"></div>
     );
   }
 

From c1e86f43a1e1391915ac0fc8f5e2b9ab3cceafb2 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sun, 25 Jun 2023 18:08:26 -0400
Subject: [PATCH 2/8] fix: Move things back to where they were

---
 src/shared/components/post/post-listing.tsx | 180 ++++++++++----------
 1 file changed, 91 insertions(+), 89 deletions(-)

diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 76690986..9186c418 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -718,94 +718,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             {(this.canMod_ || this.canAdmin_) && (
               <li>{this.modRemoveButton}</li>
             )}
-
-            {this.canMod_ && (
-              <>
-                {!this.creatorIsMod_ &&
-                  (!post_view.creator_banned_from_community ? (
-                    <li>{this.modBanFromCommunityButton}</li>
-                  ) : (
-                    <li>{this.modUnbanFromCommunityButton}</li>
-                  ))}
-                {!post_view.creator_banned_from_community && (
-                  <li>{this.addModToCommunityButton}</li>
-                )}
-              </>
-            )}
-
-            {/* Community creators and admins can transfer community to another mod */}
-            {(amCommunityCreator(post_view.creator.id, this.props.moderators) ||
-              this.canAdmin_) &&
-              this.creatorIsMod_ &&
-              (!this.state.showConfirmTransferCommunity ? (
-                <li>
-                  <button
-                    className="btn btn-link btn-animate text-muted py-0 dropdown-item"
-                    onClick={linkEvent(
-                      this,
-                      this.handleShowConfirmTransferCommunity
-                    )}
-                    aria-label={I18NextService.i18n.t("transfer_community")}
-                  >
-                    {I18NextService.i18n.t("transfer_community")}
-                  </button>
-                </li>
-              ) : (
-                <>
-                  <li>
-                    <button
-                      className="btn btn-link btn-animate text-muted py-0 dropdown-item"
-                      aria-label={I18NextService.i18n.t("are_you_sure")}
-                    >
-                      {I18NextService.i18n.t("are_you_sure")}
-                    </button>
-                  </li>
-                  <li>
-                    <button
-                      className="btn btn-link btn-animate text-muted py-0 dropdown-item"
-                      aria-label={I18NextService.i18n.t("yes")}
-                      onClick={linkEvent(this, this.handleTransferCommunity)}
-                    >
-                      {this.state.transferLoading ? (
-                        <Spinner />
-                      ) : (
-                        I18NextService.i18n.t("yes")
-                      )}
-                    </button>
-                  </li>
-                  <li>
-                    <button
-                      className="btn btn-link btn-animate text-muted py-0 dropdown-item"
-                      onClick={linkEvent(
-                        this,
-                        this.handleCancelShowConfirmTransferCommunity
-                      )}
-                      aria-label={I18NextService.i18n.t("no")}
-                    >
-                      {I18NextService.i18n.t("no")}
-                    </button>
-                  </li>
-                </>
-              ))}
-            {/* Admins can ban from all, and appoint other admins */}
-            {this.canAdmin_ && (
-              <>
-                {!this.creatorIsAdmin_ && (
-                  <>
-                    {!isBanned(post_view.creator) ? (
-                      <li>{modBanButton}</li>
-                    ) : (
-                      <li>{modUnbanButton}</li>
-                    )}
-                    <li>{purgePersonButton}</li>
-                    <li>{purgePostButton}</li>
-                  </>
-                )}
-                {!isBanned(post_view.creator) && post_view.creator.local && (
-                  <li>{toggleAdminButton}</li>
-                )}
-              </>
-            )}
           </ul>
         </div>
       </>
@@ -1214,7 +1126,97 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
     // TODO: make nicer
     const post_view = this.postView;
     return (
-      this.state.showAdvanced && <div className="mt-3 user-actions-line"></div>
+      this.state.showAdvanced && (
+        <div className="mt-3 user-actions-line">
+          {this.canMod_ && (
+            <>
+              {!this.creatorIsMod_ &&
+                (!post_view.creator_banned_from_community ? (
+                  <li>{this.modBanFromCommunityButton}</li>
+                ) : (
+                  <li>{this.modUnbanFromCommunityButton}</li>
+                ))}
+              {!post_view.creator_banned_from_community && (
+                <li>{this.addModToCommunityButton}</li>
+              )}
+            </>
+          )}
+
+          {/* Community creators and admins can transfer community to another mod */}
+          {(amCommunityCreator(post_view.creator.id, this.props.moderators) ||
+            this.canAdmin_) &&
+            this.creatorIsMod_ &&
+            (!this.state.showConfirmTransferCommunity ? (
+              <li>
+                <button
+                  className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                  onClick={linkEvent(
+                    this,
+                    this.handleShowConfirmTransferCommunity
+                  )}
+                  aria-label={I18NextService.i18n.t("transfer_community")}
+                >
+                  {I18NextService.i18n.t("transfer_community")}
+                </button>
+              </li>
+            ) : (
+              <>
+                <li>
+                  <button
+                    className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                    aria-label={I18NextService.i18n.t("are_you_sure")}
+                  >
+                    {I18NextService.i18n.t("are_you_sure")}
+                  </button>
+                </li>
+                <li>
+                  <button
+                    className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                    aria-label={I18NextService.i18n.t("yes")}
+                    onClick={linkEvent(this, this.handleTransferCommunity)}
+                  >
+                    {this.state.transferLoading ? (
+                      <Spinner />
+                    ) : (
+                      I18NextService.i18n.t("yes")
+                    )}
+                  </button>
+                </li>
+                <li>
+                  <button
+                    className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                    onClick={linkEvent(
+                      this,
+                      this.handleCancelShowConfirmTransferCommunity
+                    )}
+                    aria-label={I18NextService.i18n.t("no")}
+                  >
+                    {I18NextService.i18n.t("no")}
+                  </button>
+                </li>
+              </>
+            ))}
+          {/* Admins can ban from all, and appoint other admins */}
+          {this.canAdmin_ && (
+            <>
+              {!this.creatorIsAdmin_ && (
+                <>
+                  {!isBanned(post_view.creator) ? (
+                    <li>{this.modBanButton}</li>
+                  ) : (
+                    <li>{this.modUnbanButton}</li>
+                  )}
+                  <li>{this.purgePersonButton}</li>
+                  <li>{this.purgePostButton}</li>
+                </>
+              )}
+              {!isBanned(post_view.creator) && post_view.creator.local && (
+                <li>{this.toggleAdminButton}</li>
+              )}
+            </>
+          )}
+        </div>
+      )
     );
   }
 

From 69966369d3c182ec8821f45e013239d4aa6bd740 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sun, 25 Jun 2023 18:11:12 -0400
Subject: [PATCH 3/8] fix: Remove extraneous classes

---
 src/shared/components/post/post-listing.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 9186c418..6b65cde3 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -985,7 +985,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get modBanFromCommunityButton() {
     return (
       <button
-        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleModBanFromCommunityShow)}
         aria-label={I18NextService.i18n.t("ban_from_community")}
       >
@@ -997,7 +997,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get modUnbanFromCommunityButton() {
     return (
       <button
-        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleModBanFromCommunitySubmit)}
         aria-label={I18NextService.i18n.t("unban")}
       >
@@ -1009,7 +1009,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get addModToCommunityButton() {
     return (
       <button
-        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleAddModToCommunity)}
         aria-label={
           this.creatorIsMod_
@@ -1031,7 +1031,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get modBanButton() {
     return (
       <button
-        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleModBanShow)}
         aria-label={I18NextService.i18n.t("ban_from_site")}
       >
@@ -1043,7 +1043,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get modUnbanButton() {
     return (
       <button
-        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleModBanSubmit)}
         aria-label={I18NextService.i18n.t("unban_from_site")}
       >
@@ -1059,7 +1059,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get purgePersonButton() {
     return (
       <button
-        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handlePurgePersonShow)}
         aria-label={I18NextService.i18n.t("purge_user")}
       >
@@ -1071,7 +1071,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get purgePostButton() {
     return (
       <button
-        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handlePurgePostShow)}
         aria-label={I18NextService.i18n.t("purge_post")}
       >
@@ -1083,7 +1083,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   get toggleAdminButton() {
     return (
       <button
-        className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+        className="btn btn-link btn-animate text-muted py-0"
         onClick={linkEvent(this, this.handleAddAdmin)}
       >
         {this.state.addAdminLoading ? (

From 6c2ee399b95ab6e6cd5b77edf4813a4512b5d241 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sun, 25 Jun 2023 18:13:13 -0400
Subject: [PATCH 4/8] fix: Remove wrapping li's

---
 src/shared/components/post/post-listing.tsx | 90 +++++++++------------
 1 file changed, 40 insertions(+), 50 deletions(-)

diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 6b65cde3..15fa0813 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -1147,53 +1147,45 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             this.canAdmin_) &&
             this.creatorIsMod_ &&
             (!this.state.showConfirmTransferCommunity ? (
-              <li>
+              <button
+                className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                onClick={linkEvent(
+                  this,
+                  this.handleShowConfirmTransferCommunity
+                )}
+                aria-label={I18NextService.i18n.t("transfer_community")}
+              >
+                {I18NextService.i18n.t("transfer_community")}
+              </button>
+            ) : (
+              <>
+                <button
+                  className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                  aria-label={I18NextService.i18n.t("are_you_sure")}
+                >
+                  {I18NextService.i18n.t("are_you_sure")}
+                </button>
+                <button
+                  className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                  aria-label={I18NextService.i18n.t("yes")}
+                  onClick={linkEvent(this, this.handleTransferCommunity)}
+                >
+                  {this.state.transferLoading ? (
+                    <Spinner />
+                  ) : (
+                    I18NextService.i18n.t("yes")
+                  )}
+                </button>
                 <button
                   className="btn btn-link btn-animate text-muted py-0 dropdown-item"
                   onClick={linkEvent(
                     this,
-                    this.handleShowConfirmTransferCommunity
+                    this.handleCancelShowConfirmTransferCommunity
                   )}
-                  aria-label={I18NextService.i18n.t("transfer_community")}
+                  aria-label={I18NextService.i18n.t("no")}
                 >
-                  {I18NextService.i18n.t("transfer_community")}
+                  {I18NextService.i18n.t("no")}
                 </button>
-              </li>
-            ) : (
-              <>
-                <li>
-                  <button
-                    className="btn btn-link btn-animate text-muted py-0 dropdown-item"
-                    aria-label={I18NextService.i18n.t("are_you_sure")}
-                  >
-                    {I18NextService.i18n.t("are_you_sure")}
-                  </button>
-                </li>
-                <li>
-                  <button
-                    className="btn btn-link btn-animate text-muted py-0 dropdown-item"
-                    aria-label={I18NextService.i18n.t("yes")}
-                    onClick={linkEvent(this, this.handleTransferCommunity)}
-                  >
-                    {this.state.transferLoading ? (
-                      <Spinner />
-                    ) : (
-                      I18NextService.i18n.t("yes")
-                    )}
-                  </button>
-                </li>
-                <li>
-                  <button
-                    className="btn btn-link btn-animate text-muted py-0 dropdown-item"
-                    onClick={linkEvent(
-                      this,
-                      this.handleCancelShowConfirmTransferCommunity
-                    )}
-                    aria-label={I18NextService.i18n.t("no")}
-                  >
-                    {I18NextService.i18n.t("no")}
-                  </button>
-                </li>
               </>
             ))}
           {/* Admins can ban from all, and appoint other admins */}
@@ -1201,18 +1193,16 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             <>
               {!this.creatorIsAdmin_ && (
                 <>
-                  {!isBanned(post_view.creator) ? (
-                    <li>{this.modBanButton}</li>
-                  ) : (
-                    <li>{this.modUnbanButton}</li>
-                  )}
-                  <li>{this.purgePersonButton}</li>
-                  <li>{this.purgePostButton}</li>
+                  {!isBanned(post_view.creator)
+                    ? this.modBanButton
+                    : this.modUnbanButton}
+                  {this.purgePersonButton}
+                  {this.purgePostButton}
                 </>
               )}
-              {!isBanned(post_view.creator) && post_view.creator.local && (
-                <li>{this.toggleAdminButton}</li>
-              )}
+              {!isBanned(post_view.creator) &&
+                post_view.creator.local &&
+                this.toggleAdminButton}
             </>
           )}
         </div>

From 7259472254e68cc9c30950bf5ed66f05d95652bc Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sun, 25 Jun 2023 18:15:59 -0400
Subject: [PATCH 5/8] fix: Restore removed classes

---
 src/shared/components/post/post-listing.tsx | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 15fa0813..60fb12ff 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -1131,14 +1131,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
           {this.canMod_ && (
             <>
               {!this.creatorIsMod_ &&
-                (!post_view.creator_banned_from_community ? (
-                  <li>{this.modBanFromCommunityButton}</li>
-                ) : (
-                  <li>{this.modUnbanFromCommunityButton}</li>
-                ))}
-              {!post_view.creator_banned_from_community && (
-                <li>{this.addModToCommunityButton}</li>
-              )}
+                (!post_view.creator_banned_from_community
+                  ? this.modBanFromCommunityButton
+                  : this.modUnbanFromCommunityButton)}
+              {!post_view.creator_banned_from_community &&
+                this.addModToCommunityButton}
             </>
           )}
 
@@ -1160,13 +1157,13 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             ) : (
               <>
                 <button
-                  className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                  className="d-inline-block me-1 btn btn-link btn-animate text-muted py-0 dropdown-item"
                   aria-label={I18NextService.i18n.t("are_you_sure")}
                 >
                   {I18NextService.i18n.t("are_you_sure")}
                 </button>
                 <button
-                  className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                  className="btn btn-link btn-animate text-muted py-0 dropdown-item d-inline-block me-1"
                   aria-label={I18NextService.i18n.t("yes")}
                   onClick={linkEvent(this, this.handleTransferCommunity)}
                 >
@@ -1177,7 +1174,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                   )}
                 </button>
                 <button
-                  className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                  className="btn btn-link btn-animate text-muted py-0 dropdown-item d-inline-block"
                   onClick={linkEvent(
                     this,
                     this.handleCancelShowConfirmTransferCommunity

From e7889c4f69a0dc5c530da70c5f7a01606abbbf3a Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sun, 25 Jun 2023 18:18:16 -0400
Subject: [PATCH 6/8] fix: Remove unnecessary classes

---
 src/shared/components/post/post-listing.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 60fb12ff..763c37c0 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -1145,7 +1145,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             this.creatorIsMod_ &&
             (!this.state.showConfirmTransferCommunity ? (
               <button
-                className="btn btn-link btn-animate text-muted py-0 dropdown-item"
+                className="btn btn-link btn-animate text-muted py-0"
                 onClick={linkEvent(
                   this,
                   this.handleShowConfirmTransferCommunity
@@ -1157,13 +1157,13 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             ) : (
               <>
                 <button
-                  className="d-inline-block me-1 btn btn-link btn-animate text-muted py-0 dropdown-item"
+                  className="d-inline-block me-1 btn btn-link btn-animate text-muted py-0"
                   aria-label={I18NextService.i18n.t("are_you_sure")}
                 >
                   {I18NextService.i18n.t("are_you_sure")}
                 </button>
                 <button
-                  className="btn btn-link btn-animate text-muted py-0 dropdown-item d-inline-block me-1"
+                  className="btn btn-link btn-animate text-muted py-0 d-inline-block me-1"
                   aria-label={I18NextService.i18n.t("yes")}
                   onClick={linkEvent(this, this.handleTransferCommunity)}
                 >
@@ -1174,7 +1174,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
                   )}
                 </button>
                 <button
-                  className="btn btn-link btn-animate text-muted py-0 dropdown-item d-inline-block"
+                  className="btn btn-link btn-animate text-muted py-0 d-inline-block"
                   onClick={linkEvent(
                     this,
                     this.handleCancelShowConfirmTransferCommunity

From 0bab91948c9dea0868b0161632c323802f678623 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sun, 25 Jun 2023 18:18:47 -0400
Subject: [PATCH 7/8] fix: Remove unnecessary class

---
 src/shared/components/post/post-listing.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 763c37c0..9a382d66 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -1127,7 +1127,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
     const post_view = this.postView;
     return (
       this.state.showAdvanced && (
-        <div className="mt-3 user-actions-line">
+        <div className="mt-3">
           {this.canMod_ && (
             <>
               {!this.creatorIsMod_ &&

From 17710d492cc849ea7faa8ca8e34994ae7229cbaa Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Mon, 26 Jun 2023 10:37:21 -0400
Subject: [PATCH 8/8] chore(DX): Add prettier to eslint config for use with
 editors

---
 .eslintrc.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 81257cb3..ad777401 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,7 +3,7 @@
   "env": {
     "browser": true
   },
-  "plugins": ["@typescript-eslint", "jsx-a11y"],
+  "plugins": ["@typescript-eslint", "jsx-a11y", "prettier"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
@@ -41,6 +41,7 @@
     "no-var": 0,
     "prefer-const": 1,
     "prefer-rest-params": 0,
+    "prettier/prettier": "error",
     "quote-props": 0,
     "unicorn/filename-case": 0
   }