fedi/lemmy-ui
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-27 00:09:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into add_community_language

Browse source
This commit is contained in:
Dessalines 2022-12-14 10:04:45 -05:00
parent 51a9c39ab9 003b177f6e
commit 079ed3b865
9 changed files with 99 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lemmy-translations

@ -1 +1 @@
Subproject commit 46f4b3e8676c23d4a8100ce78330eceed7bcf053
Subproject commit a2f59fcbf7529a1f7dd5cda894381ef2000b9ef5

2
package.json
View file

@ -47,7 +47,7 @@
"inferno-server": "^8.0.3",
"isomorphic-cookie": "^1.2.4",
"jwt-decode": "^3.1.2",
"lemmy-js-client": "0.17.0-rc.55",
"lemmy-js-client": "0.17.0-rc.56",
"markdown-it": "^13.0.1",
"markdown-it-container": "^3.0.0",
"markdown-it-footnote": "^3.0.3",

2
src/shared/components/community/community.tsx
View file

@ -607,7 +607,7 @@ export class Community extends Component<any, State> {
op == UserOperation.DeletePost ||
op == UserOperation.RemovePost ||
op == UserOperation.LockPost ||
op == UserOperation.StickyPost ||
op == UserOperation.FeaturePost ||
op == UserOperation.SavePost
) {
let data = wsJsonToRes<PostResponse>(msg, PostResponse);

2
src/shared/components/home/home.tsx
View file

@ -811,7 +811,7 @@ export class Home extends Component<any, HomeState> {
op == UserOperation.DeletePost ||
op == UserOperation.RemovePost ||
op == UserOperation.LockPost ||
op == UserOperation.StickyPost ||
op == UserOperation.FeaturePost ||
op == UserOperation.SavePost
) {
let data = wsJsonToRes<PostResponse>(msg, PostResponse);

31
src/shared/components/modlog.tsx
View file

@ -16,12 +16,12 @@ import {
ModAddView,
ModBanFromCommunityView,
ModBanView,
ModFeaturePostView,
ModLockPostView,
ModlogActionType,
ModRemoveCommentView,
ModRemoveCommunityView,
ModRemovePostView,
ModStickyPostView,
ModTransferCommunityView,
PersonSafe,
toUndefined,
@ -61,7 +61,7 @@ type ModlogType = {
view:
| ModRemovePostView
| ModLockPostView
| ModStickyPostView
| ModFeaturePostView
| ModRemoveCommentView
| ModRemoveCommunityView
| ModBanFromCommunityView
@ -182,12 +182,12 @@ export class Modlog extends Component<any, ModlogState> {
when_: r.mod_lock_post.when_,
}));
let stickied_posts: ModlogType[] = res.stickied_posts.map(r => ({
id: r.mod_sticky_post.id,
type_: ModlogActionType.ModStickyPost,
let featured_posts: ModlogType[] = res.featured_posts.map(r => ({
id: r.mod_feature_post.id,
type_: ModlogActionType.ModFeaturePost,
view: r,
moderator: r.moderator,
when_: r.mod_sticky_post.when_,
when_: r.mod_feature_post.when_,
}));
let removed_comments: ModlogType[] = res.removed_comments.map(r => ({
@ -287,7 +287,7 @@ export class Modlog extends Component<any, ModlogState> {
combined.push(...removed_posts);
combined.push(...locked_posts);
combined.push(...stickied_posts);
combined.push(...featured_posts);
combined.push(...removed_comments);
combined.push(...removed_communities);
combined.push(...banned_from_community);
@ -344,18 +344,21 @@ export class Modlog extends Component<any, ModlogState> {
</>
);
}
case ModlogActionType.ModStickyPost: {
let mspv = i.view as ModStickyPostView;
case ModlogActionType.ModFeaturePost: {
let mspv = i.view as ModFeaturePostView;
return (
<>
<span>
{mspv.mod_sticky_post.stickied.unwrapOr(false)
? "Stickied "
: "Unstickied "}
{mspv.mod_feature_post.featured ? "Featured " : "Unfeatured "}
</span>
<span>
Post <Link to={`/post/${mspv.post.id}`}>{mspv.post.name}</Link>
</span>
<span>
{mspv.mod_feature_post.is_featured_community
? " In Community"
: " In Local"}
</span>
</>
);
}
@ -679,8 +682,8 @@ export class Modlog extends Component<any, ModlogState> {
<option value={ModlogActionType.ModLockPost}>
Locking Posts
</option>
<option value={ModlogActionType.ModStickyPost}>
Stickying Posts
<option value={ModlogActionType.ModFeaturePost}>
Featuring Posts
</option>
<option value={ModlogActionType.ModRemoveComment}>
Removing Comments

2
src/shared/components/person/profile.tsx
View file

@ -865,7 +865,7 @@ export class Profile extends Component<any, ProfileState> {
op == UserOperation.DeletePost ||
op == UserOperation.RemovePost ||
op == UserOperation.LockPost ||
op == UserOperation.StickyPost ||
op == UserOperation.FeaturePost ||
op == UserOperation.SavePost
) {
let data = wsJsonToRes<PostResponse>(msg, PostResponse);

99
src/shared/components/post/post-listing.tsx
View file

@ -12,15 +12,16 @@ import {
CreatePostLike,
CreatePostReport,
DeletePost,
FeaturePost,
Language,
LockPost,
PersonViewSafe,
PostFeatureType,
PostView,
PurgePerson,
PurgePost,
RemovePost,
SavePost,
StickyPost,
toUndefined,
TransferCommunity,
} from "lemmy-js-client";
@ -29,6 +30,7 @@ import { i18n } from "../../i18next";
import { BanType, PurgeType } from "../../interfaces";
import { UserService, WebSocketService } from "../../services";
import {
amAdmin,
amCommunityCreator,
auth,
canAdmin,
@ -454,7 +456,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
let post = this.props.post_view.post;
return (
<Link
className={!post.stickied ? "text-body" : "text-primary"}
className={
!post.featured_community && !post.featured_local
? "text-body"
: "text-primary"
}
to={`/post/${post.id}`}
title={i18n.t("comments")}
>
@ -472,7 +478,11 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
some: url =>
this.props.showBody ? (
<a
className={!post.stickied ? "text-body" : "text-primary"}
className={
!post.featured_community && !post.featured_local
? "text-body"
: "text-primary"
}
href={url}
title={url}
rel={relTags}
@ -519,14 +529,22 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
<Icon icon="lock" classes="icon-inline text-danger" />
</small>
)}
{post.stickied && (
{post.featured_community && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("stickied")}
data-tippy-content={i18n.t("featured")}
>
<Icon icon="pin" classes="icon-inline text-primary" />
</small>
)}
{post.featured_local && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("featured")}
>
<Icon icon="pin" classes="icon-inline text-secondary" />
</small>
)}
{post.nsfw && (
<small className="ml-2 text-muted font-italic">
{i18n.t("nsfw")}
@ -619,7 +637,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
{this.canModOnSelf_ && (
<>
{this.lockButton}
{this.stickyButton}
{this.featureButton}
</>
)}
{(this.canMod_ || this.canAdmin_) && <>{this.modRemoveButton}</>}
@ -856,22 +874,48 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
);
}
get stickyButton() {
let stickied = this.props.post_view.post.stickied;
let label = stickied ? i18n.t("unsticky") : i18n.t("sticky");
get featureButton() {
const featured_community = this.props.post_view.post.featured_community;
const label_community = featured_community
? 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
? i18n.t("unfeature_from_local")
: i18n.t("feature_in_local");
return (
<button
className="btn btn-link btn-animate text-muted py-0"
onClick={linkEvent(this, this.handleModSticky)}
data-tippy-content={label}
aria-label={label}
>
<Icon
icon="pin"
classes={classNames({ "text-success": stickied })}
inline
/>
</button>
<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}
>
<Icon
icon="pin"
classes={classNames({ "text-success": featured_community })}
inline
/>{" "}
Community
</button>
{is_admin && (
<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}
>
<Icon
icon="pin"
classes={classNames({ "text-success": featured_local })}
inline
/>{" "}
Local
</button>
)}
</span>
);
}
@ -1493,13 +1537,18 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
WebSocketService.Instance.send(wsClient.lockPost(form));
}
handleModSticky(i: PostListing) {
let form = new StickyPost({
handleModFeaturePost(i: PostListing, is_community: boolean) {
let form = new FeaturePost({
post_id: i.props.post_view.post.id,
stickied: !i.props.post_view.post.stickied,
featured: is_community
? !i.props.post_view.post.featured_community
: !i.props.post_view.post.featured_local,
feature_type: is_community
? PostFeatureType.Community
: PostFeatureType.Local,
auth: auth().unwrap(),
});
WebSocketService.Instance.send(wsClient.stickyPost(form));
WebSocketService.Instance.send(wsClient.featurePost(form));
}
handleModBanFromCommunityShow(i: PostListing) {

2
src/shared/components/post/post.tsx
View file

@ -762,7 +762,7 @@ export class Post extends Component<any, PostState> {
op == UserOperation.DeletePost ||
op == UserOperation.RemovePost ||
op == UserOperation.LockPost ||
op == UserOperation.StickyPost ||
op == UserOperation.FeaturePost ||
op == UserOperation.SavePost
) {
let data = wsJsonToRes<PostResponse>(msg, PostResponse);

3
src/shared/utils.ts
View file

@ -969,7 +969,8 @@ export function editPostRes(data: PostView, post: PostView) {
post.post.nsfw = data.post.nsfw;
post.post.deleted = data.post.deleted;
post.post.removed = data.post.removed;
post.post.stickied = data.post.stickied;
post.post.featured_community = data.post.featured_community;
post.post.featured_local = data.post.featured_local;
post.post.body = data.post.body;
post.post.locked = data.post.locked;
post.saved = data.saved;