Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Feb 21, 2023
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f80990
Let any mod feature and lock posts. Fixes #875
dessalines Feb 21, 2023
a728767
Change to amAdmin
dessalines Feb 21, 2023
cd92424
Merge branch 'main' into fix_lock_and_feature_perms
dessalines Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 31 additions & 24 deletions src/shared/components/post/post-listing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { UserService, WebSocketService } from "../../services";
import {
amAdmin,
amCommunityCreator,
amMod,
canAdmin,
canMod,
futureDaysToUnixTime,
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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));
Expand Down