Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into feature/add-ids-and-classes

Browse source
This commit is contained in:
Zetaphor 2023-06-16 14:14:10 -03:00
commit 6a9b936d08
3 changed files with 25 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -647,6 +647,12 @@ export class Community extends Component<
const blockCommunityRes = await HttpService.client.blockCommunity(form);
if (blockCommunityRes.state == "success") {
updateCommunityBlock(blockCommunityRes.data);
this.setState(s => {
if (s.communityRes.state == "success") {
s.communityRes.data.community_view.blocked =
blockCommunityRes.data.blocked;
}
});
}
}

45
src/shared/components/community/sidebar.tsx
View file

@ -64,7 +64,6 @@ interface SidebarState {
removeCommunityLoading: boolean;
leaveModTeamLoading: boolean;
followCommunityLoading: boolean;
blockCommunityLoading: boolean;
purgeCommunityLoading: boolean;
}
@ -78,7 +77,6 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
removeCommunityLoading: false,
leaveModTeamLoading: false,
followCommunityLoading: false,
blockCommunityLoading: false,
purgeCommunityLoading: false,
};
@ -105,7 +103,6 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
removeCommunityLoading: false,
leaveModTeamLoading: false,
followCommunityLoading: false,
blockCommunityLoading: false,
purgeCommunityLoading: false,
});
}
@ -376,35 +373,18 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
}
blockCommunity() {
const community_view = this.props.community_view;
const blocked = this.props.community_view.blocked;
const { subscribed, blocked } = this.props.community_view;
return (
<div className="mb-2">
{community_view.subscribed == "NotSubscribed" &&
(blocked ? (
<button
className="btn btn-danger btn-block"
onClick={linkEvent(this, this.handleBlockCommunity)}
>
{this.state.blockCommunityLoading ? (
<Spinner />
) : (
i18n.t("unblock_community")
)}
</button>
) : (
<button
className="btn btn-danger btn-block"
onClick={linkEvent(this, this.handleBlockCommunity)}
>
{this.state.blockCommunityLoading ? (
<Spinner />
) : (
i18n.t("block_community")
)}
</button>
))}
{subscribed == "NotSubscribed" && (
<button
className="btn btn-danger btn-block"
onClick={linkEvent(this, this.handleBlockCommunity)}
>
{i18n.t(blocked ? "unblock_community" : "block_community")}
</button>
)}
</div>
);
}
@ -668,10 +648,11 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
}
handleBlockCommunity(i: Sidebar) {
i.setState({ blockCommunityLoading: true });
const { community, blocked } = i.props.community_view;
i.props.onBlockCommunity({
community_id: 0,
block: !i.props.community_view.blocked,
community_id: community.id,
block: !blocked,
auth: myAuthRequired(),
});
}

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

@ -730,19 +730,14 @@ export class Post extends Component<any, PostState> {
async handleBlockCommunity(form: BlockCommunity) {
const blockCommunityRes = await HttpService.client.blockCommunity(form);
// TODO Probably isn't necessary
this.setState(s => {
if (
s.postRes.state == "success" &&
blockCommunityRes.state == "success"
) {
s.postRes.data.community_view = blockCommunityRes.data.community_view;
}
return s;
});
if (blockCommunityRes.state == "success") {
updateCommunityBlock(blockCommunityRes.data);
this.setState(s => {
if (s.postRes.state == "success") {
s.postRes.data.community_view.blocked =
blockCommunityRes.data.blocked;
}
});
}
}