Allow DMing non friends
parent
d116f5dfa8
commit
5d1212fa67
|
|
@ -1,7 +1,7 @@
|
||||||
import { HappyBeaming, Send, ShieldX } from "@styled-icons/boxicons-solid";
|
import { HappyBeaming, Send, ShieldX } from "@styled-icons/boxicons-solid";
|
||||||
import Axios, { CancelTokenSource } from "axios";
|
import Axios, { CancelTokenSource } from "axios";
|
||||||
import { observer } from "mobx-react-lite";
|
import { observer } from "mobx-react-lite";
|
||||||
import { Channel } from "revolt.js";
|
import { Channel, User } from "revolt.js";
|
||||||
import styled, { css } from "styled-components/macro";
|
import styled, { css } from "styled-components/macro";
|
||||||
import { ulid } from "ulid";
|
import { ulid } from "ulid";
|
||||||
|
|
||||||
|
|
@ -229,6 +229,19 @@ export default observer(({ channel }: Props) => {
|
||||||
|
|
||||||
const renderer = getRenderer(channel);
|
const renderer = getRenderer(channel);
|
||||||
|
|
||||||
|
const isBlocked = () => {
|
||||||
|
if (channel.channel_type === "DirectMessage") {
|
||||||
|
const recipient = channel.recipient;
|
||||||
|
if (recipient instanceof User) {
|
||||||
|
return (
|
||||||
|
recipient.relationship === "Blocked" ||
|
||||||
|
recipient.relationship === "BlockedOther"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
|
||||||
if (channel.server?.member?.timeout) {
|
if (channel.server?.member?.timeout) {
|
||||||
return (
|
return (
|
||||||
<Base>
|
<Base>
|
||||||
|
|
@ -257,7 +270,12 @@ export default observer(({ channel }: Props) => {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!channel.havePermission("SendMessage")) {
|
if (
|
||||||
|
(channel.channel_type !== "DirectMessage" &&
|
||||||
|
channel.channel_type !== "Group" &&
|
||||||
|
!channel.havePermission("SendMessage")) ||
|
||||||
|
isBlocked()
|
||||||
|
) {
|
||||||
return (
|
return (
|
||||||
<Base>
|
<Base>
|
||||||
<Blocked>
|
<Blocked>
|
||||||
|
|
|
||||||
|
|
@ -207,7 +207,7 @@ export const UserProfile = observer(
|
||||||
</Button>
|
</Button>
|
||||||
</Link>
|
</Link>
|
||||||
)}
|
)}
|
||||||
{(user.relationship === "Friend" || user.bot) && (
|
{(user.relationship !== "Blocked" && user.relationship !== "BlockedOther" || user.bot) && (
|
||||||
<Localizer>
|
<Localizer>
|
||||||
<Tooltip
|
<Tooltip
|
||||||
content={
|
content={
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue