mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-11-22 12:21:13 +00:00
Some fixes.
This commit is contained in:
parent
6db259efe1
commit
9e15b79622
1 changed files with 22 additions and 20 deletions
|
@ -110,7 +110,7 @@ export class Profile extends Component<any, ProfileState> {
|
|||
}
|
||||
|
||||
setupTippy();
|
||||
this.setPersonBlock()
|
||||
this.setPersonBlock();
|
||||
}
|
||||
|
||||
fetchUserData() {
|
||||
|
@ -131,9 +131,11 @@ export class Profile extends Component<any, ProfileState> {
|
|||
this.state.personRes.person_view.person.id
|
||||
);
|
||||
}
|
||||
|
||||
setPersonBlock() {
|
||||
this.state.personBlocked = UserService.Instance.myUserInfo.person_blocks.
|
||||
map(a => a.target.id).includes(this.state.personRes.person_view.person.id)
|
||||
this.state.personBlocked = UserService.Instance.myUserInfo.person_blocks
|
||||
.map(a => a.target.id)
|
||||
.includes(this.state.personRes?.person_view.person.id);
|
||||
}
|
||||
|
||||
static getViewFromProps(view: string): PersonDetailsView {
|
||||
|
@ -426,24 +428,23 @@ export class Profile extends Component<any, ProfileState> {
|
|||
>
|
||||
{i18n.t("send_message")}
|
||||
</Link>
|
||||
{this.state.personBlocked ?
|
||||
(
|
||||
<a
|
||||
{this.state.personBlocked ? (
|
||||
<button
|
||||
className={"d-flex align-self-start btn btn-secondary"}
|
||||
onClick={linkEvent(pv.person.id, this.handleUnblockPerson)}
|
||||
href="#"
|
||||
onClick={linkEvent(
|
||||
pv.person.id,
|
||||
this.handleUnblockPerson
|
||||
)}
|
||||
>
|
||||
{i18n.t("unblock_user")}
|
||||
</a>
|
||||
) :
|
||||
(
|
||||
<a
|
||||
</button>
|
||||
) : (
|
||||
<button
|
||||
className={"d-flex align-self-start btn btn-secondary"}
|
||||
onClick={linkEvent(pv.person.id, this.handleBlockPerson)}
|
||||
href="#"
|
||||
>
|
||||
{i18n.t("block_user")}
|
||||
</a>
|
||||
</button>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
|
@ -581,6 +582,7 @@ export class Profile extends Component<any, ProfileState> {
|
|||
this.state.personRes = data;
|
||||
console.log(data);
|
||||
this.state.loading = false;
|
||||
this.setPersonBlock();
|
||||
this.setState(this.state);
|
||||
restoreScrollPosition(this.context);
|
||||
} else if (op == UserOperation.AddAdmin) {
|
||||
|
@ -639,7 +641,7 @@ export class Profile extends Component<any, ProfileState> {
|
|||
} else if (op == UserOperation.BlockPerson) {
|
||||
let data = wsJsonToRes<BlockPersonResponse>(msg).data;
|
||||
updatePersonBlock(data);
|
||||
this.setPersonBlock()
|
||||
this.setPersonBlock();
|
||||
this.setState(this.state);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue