LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-22 20:31:13 +00:00
Code Issues Projects Releases Wiki Activity

Adding block from community sidebar. Fixes #690 (#716)

Browse source 
* Adding block from community sidebar. Fixes #690

* Fixing lint
This commit is contained in:
Dessalines 2022-07-29 23:38:37 -04:00 committed by GitHub
parent b2cab8d126
commit e68babe38b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ import { Component, linkEvent } from "inferno";
import {
AddModToCommunityResponse,
BanFromCommunityResponse,
BlockCommunityResponse,
BlockPersonResponse,
CommentReportResponse,
CommentResponse,
@ -53,6 +54,7 @@ import {
setupTippy,
showLocal,
toast,
updateCommunityBlock,
updatePersonBlock,
wsClient,
wsSubscribe,
@ -663,6 +665,17 @@ export class Community extends Component<any, State> {
toast(i18n.t("purge_success"));
this.context.router.history.push(`/`);
}
} else if (op == UserOperation.BlockCommunity) {
let data = wsJsonToRes<BlockCommunityResponse>(
msg,
BlockCommunityResponse
);
this.state.communityRes.match({
some: res => (res.community_view.blocked = data.blocked),
none: void 0,
});
updateCommunityBlock(data);
this.setState(this.state);
}
}
}

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

@ -3,6 +3,7 @@ import { Component, linkEvent } from "inferno";
import { Link } from "inferno-router";
import {
AddModToCommunity,
BlockCommunity,
CommunityModeratorView,
CommunityView,
DeleteCommunity,
@ -120,23 +121,21 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
)}
<span class="mr-2">{community.title}</span>
{subscribed == SubscribedType.Subscribed && (
<a
<button
class="btn btn-secondary btn-sm mr-2"
href="#"
onClick={linkEvent(this, this.handleUnsubscribe)}
>
<Icon icon="check" classes="icon-inline text-success mr-1" />
{i18n.t("joined")}
</a>
</button>
)}
{subscribed == SubscribedType.Pending && (
<a
<button
class="btn btn-warning mr-2"
href="#"
onClick={linkEvent(this, this.handleUnsubscribe)}
>
{i18n.t("subscribe_pending")}
</a>
</button>
)}
{community.removed && (
<small className="mr-2 text-muted font-italic">
@ -289,16 +288,33 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
subscribe() {
let community_view = this.props.community_view;
let blocked = this.props.community_view.blocked;
return (
<div class="mb-2">
{community_view.subscribed == SubscribedType.NotSubscribed && (
<a
<>
<button
class="btn btn-secondary btn-block"
href="#"
onClick={linkEvent(this, this.handleSubscribe)}
>
{i18n.t("subscribe")}
</a>
</button>
{blocked ? (
<button
class="btn btn-danger btn-block"
onClick={linkEvent(this, this.handleUnblock)}
>
{i18n.t("unblock_community")}
</button>
) : (
<button
class="btn btn-danger btn-block"
onClick={linkEvent(this, this.handleBlock)}
>
{i18n.t("block_community")}
</button>
)}
</>
)}
</div>
);
@ -641,4 +657,24 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
i.state.purgeLoading = true;
i.setState(i.state);
}
handleBlock(i: Sidebar, event: any) {
event.preventDefault();
let blockCommunityForm = new BlockCommunity({
community_id: i.props.community_view.community.id,
block: true,
auth: auth().unwrap(),
});
WebSocketService.Instance.send(wsClient.blockCommunity(blockCommunityForm));
}
handleUnblock(i: Sidebar, event: any) {
event.preventDefault();
let blockCommunityForm = new BlockCommunity({
community_id: i.props.community_view.community.id,
block: false,
auth: auth().unwrap(),
});
WebSocketService.Instance.send(wsClient.blockCommunity(blockCommunityForm));
}
}