diff --git a/lemmy-translations b/lemmy-translations index 46f4b3e8..a2f59fcb 160000 --- a/lemmy-translations +++ b/lemmy-translations @@ -1 +1 @@ -Subproject commit 46f4b3e8676c23d4a8100ce78330eceed7bcf053 +Subproject commit a2f59fcbf7529a1f7dd5cda894381ef2000b9ef5 diff --git a/package.json b/package.json index 99752cac..650990c0 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/shared/components/community/community.tsx b/src/shared/components/community/community.tsx index fc6ee60e..4fb7faa3 100644 --- a/src/shared/components/community/community.tsx +++ b/src/shared/components/community/community.tsx @@ -607,7 +607,7 @@ export class Community extends Component { op == UserOperation.DeletePost || op == UserOperation.RemovePost || op == UserOperation.LockPost || - op == UserOperation.StickyPost || + op == UserOperation.FeaturePost || op == UserOperation.SavePost ) { let data = wsJsonToRes(msg, PostResponse); diff --git a/src/shared/components/home/home.tsx b/src/shared/components/home/home.tsx index 31289c2a..2b51e8ed 100644 --- a/src/shared/components/home/home.tsx +++ b/src/shared/components/home/home.tsx @@ -811,7 +811,7 @@ export class Home extends Component { op == UserOperation.DeletePost || op == UserOperation.RemovePost || op == UserOperation.LockPost || - op == UserOperation.StickyPost || + op == UserOperation.FeaturePost || op == UserOperation.SavePost ) { let data = wsJsonToRes(msg, PostResponse); diff --git a/src/shared/components/modlog.tsx b/src/shared/components/modlog.tsx index e097d972..95e0cc86 100644 --- a/src/shared/components/modlog.tsx +++ b/src/shared/components/modlog.tsx @@ -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 { 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 { 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 { ); } - case ModlogActionType.ModStickyPost: { - let mspv = i.view as ModStickyPostView; + case ModlogActionType.ModFeaturePost: { + let mspv = i.view as ModFeaturePostView; return ( <> - {mspv.mod_sticky_post.stickied.unwrapOr(false) - ? "Stickied " - : "Unstickied "} + {mspv.mod_feature_post.featured ? "Featured " : "Unfeatured "} Post {mspv.post.name} + + {mspv.mod_feature_post.is_featured_community + ? " In Community" + : " In Local"} + ); } @@ -679,8 +682,8 @@ export class Modlog extends Component { -