feat: add support for webhooks

fix: removing reactions crashes client
This commit is contained in:
Paul Makles
2023-06-03 19:29:14 +01:00
parent 54d5c9dc4a
commit 9ad827f716
6 changed files with 31 additions and 5 deletions

View File

@@ -33,7 +33,7 @@ import InviteList from "./embed/EmbedInvite";
interface Props {
attachContext?: boolean;
queued?: QueuedMessage;
message: MessageObject;
message: MessageObject & { webhook: { name: string; avatar?: string } };
highlight?: boolean;
contrast?: boolean;
content?: Children;
@@ -138,6 +138,11 @@ const Message = observer(
<UserIcon
className="avatar"
url={message.generateMasqAvatarURL()}
override={
message.webhook?.avatar
? `https://autumn.revolt.chat/avatars/${message.webhook.avatar}`
: undefined
}
target={user}
size={36}
onClick={handleUserClick}
@@ -158,6 +163,7 @@ const Message = observer(
showServerIdentity
onClick={handleUserClick}
masquerade={message.masquerade!}
override={message.webhook?.name}
{...userContext}
/>
<MessageDetail

View File

@@ -14,6 +14,7 @@ import IconBase, { IconBaseProps } from "../IconBase";
type VoiceStatus = "muted" | "deaf";
interface Props extends IconBaseProps<User> {
status?: boolean;
override?: string;
voice?: VoiceStatus;
masquerade?: API.Masquerade;
showServerIdentity?: boolean;
@@ -70,12 +71,15 @@ export default observer(
showServerIdentity,
masquerade,
innerRef,
override,
...svgProps
} = props;
let { url } = props;
if (masquerade?.avatar) {
url = client.proxyFile(masquerade.avatar);
} else if (override) {
url = override;
} else if (!url) {
let override;
if (target && showServerIdentity) {

View File

@@ -39,6 +39,7 @@ type UsernameProps = Omit<
masquerade?: API.Masquerade;
showServerIdentity?: boolean | "both";
override?: string;
innerRef?: Ref<any>;
};
@@ -64,13 +65,16 @@ export const Username = observer(
masquerade,
showServerIdentity,
innerRef,
override,
...otherProps
}: UsernameProps) => {
let username = user?.username;
let color = masquerade?.colour;
let timed_out: Date | undefined;
if (user && showServerIdentity) {
if (override) {
username = override;
} else if (user && showServerIdentity) {
const { server } = useParams<{ server?: string }>();
if (server) {
const client = useClient();
@@ -146,6 +150,17 @@ export const Username = observer(
);
}
if (override) {
return (
<>
{el}
<BotBadge>
<Text id="app.main.channel.bot" />
</BotBadge>
</>
);
}
return el;
},
);