From: Dessalines <dessalines@users.noreply.github.com>
Date: Tue, 21 Feb 2023 20:53:51 +0000 (-0500)
Subject: Let any mod feature and lock posts. Fixes #875 (#944)
X-Git-Url: http://these/git/%22%7Burl%7D/%22https:/image.com/%7B%60%24%7BghostArchiveUrl%7D/%7Brss%7D?a=commitdiff_plain;h=49acf514e9cca8ef0629444655f53193d6a6e6db;p=lemmy-ui.git

Let any mod feature and lock posts. Fixes #875 (#944)

* Let any mod feature and lock posts. Fixes #875

* Change to amAdmin
---

diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 7580daf..d0e72e4 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -30,6 +30,7 @@ import { UserService, WebSocketService } from "../../services";
 import {
   amAdmin,
   amCommunityCreator,
+  amMod,
   canAdmin,
   canMod,
   futureDaysToUnixTime,
@@ -614,7 +615,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
         {this.state.showAdvanced && (
           <>
             {this.showBody && post_view.post.body && this.viewSourceButton}
-            {this.canModOnSelf_ && (
+            {/* Any mod can do these, not limited to hierarchy*/}
+            {(amMod(this.props.moderators) || amAdmin()) && (
               <>
                 {this.lockButton}
                 {this.featureButton}
@@ -848,41 +850,40 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
   }
 
   get featureButton() {
-    const featured_community = this.props.post_view.post.featured_community;
-    const label_community = featured_community
+    const featuredCommunity = this.props.post_view.post.featured_community;
+    const labelCommunity = featuredCommunity
       ? i18n.t("unfeature_from_community")
       : i18n.t("feature_in_community");
 
-    const is_admin = amAdmin();
-    const featured_local = this.props.post_view.post.featured_local;
-    const label_local = featured_local
+    const featuredLocal = this.props.post_view.post.featured_local;
+    const labelLocal = featuredLocal
       ? i18n.t("unfeature_from_local")
       : i18n.t("feature_in_local");
     return (
       <span>
         <button
           className="btn btn-link btn-animate text-muted py-0 pl-0"
-          onClick={() => this.handleModFeaturePost(this, true)}
-          data-tippy-content={label_community}
-          aria-label={label_community}
+          onClick={linkEvent(this, this.handleModFeaturePostCommunity)}
+          data-tippy-content={labelCommunity}
+          aria-label={labelCommunity}
         >
           <Icon
             icon="pin"
-            classes={classNames({ "text-success": featured_community })}
+            classes={classNames({ "text-success": featuredCommunity })}
             inline
           />{" "}
           Community
         </button>
-        {is_admin && (
+        {amAdmin() && (
           <button
             className="btn btn-link btn-animate text-muted py-0"
-            onClick={() => this.handleModFeaturePost(this, false)}
-            data-tippy-content={label_local}
-            aria-label={label_local}
+            onClick={linkEvent(this, this.handleModFeaturePostLocal)}
+            data-tippy-content={labelLocal}
+            aria-label={labelLocal}
           >
             <Icon
               icon="pin"
-              classes={classNames({ "text-success": featured_local })}
+              classes={classNames({ "text-success": featuredLocal })}
               inline
             />{" "}
             Local
@@ -1533,20 +1534,26 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
     }
   }
 
-  handleModFeaturePost(i: PostListing, is_community: boolean) {
+  handleModFeaturePostLocal(i: PostListing) {
     let auth = myAuth();
     if (auth) {
-      let featured: [PostFeatureType, boolean] = is_community
-        ? [
-            PostFeatureType.Community,
-            !i.props.post_view.post.featured_community,
-          ]
-        : [PostFeatureType.Local, !i.props.post_view.post.featured_local];
+      let form: FeaturePost = {
+        post_id: i.props.post_view.post.id,
+        feature_type: PostFeatureType.Local,
+        featured: !i.props.post_view.post.featured_local,
+        auth,
+      };
+      WebSocketService.Instance.send(wsClient.featurePost(form));
+    }
+  }
 
+  handleModFeaturePostCommunity(i: PostListing) {
+    let auth = myAuth();
+    if (auth) {
       let form: FeaturePost = {
         post_id: i.props.post_view.post.id,
-        feature_type: featured[0],
-        featured: featured[1],
+        feature_type: PostFeatureType.Community,
+        featured: !i.props.post_view.post.featured_community,
         auth,
       };
       WebSocketService.Instance.send(wsClient.featurePost(form));