Merge pull request #278 from TaiAurori/master

This commit is contained in:
Paul Makles 2021-09-24 13:59:57 +01:00 committed by GitHub
commit e9a88bc31c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,11 +3,12 @@ import { observer } from "mobx-react-lite";
import { useHistory } from "react-router-dom"; import { useHistory } from "react-router-dom";
import { RetrievedInvite } from "revolt-api/types/Invites"; import { RetrievedInvite } from "revolt-api/types/Invites";
import { Message } from "revolt.js/dist/maps/Messages"; import { Message } from "revolt.js/dist/maps/Messages";
import styled from "styled-components"; import styled, { css } from "styled-components";
import { useContext, useEffect, useState } from "preact/hooks"; import { useContext, useEffect, useState } from "preact/hooks";
import { defer } from "../../../../lib/defer"; import { defer } from "../../../../lib/defer";
import { isTouchscreenDevice } from "../../../../lib/isTouchscreenDevice";
import { dispatch } from "../../../../redux"; import { dispatch } from "../../../../redux";
@ -20,6 +21,7 @@ import { takeError } from "../../../../context/revoltjs/util";
import ServerIcon from "../../../../components/common/ServerIcon"; import ServerIcon from "../../../../components/common/ServerIcon";
import Button from "../../../../components/ui/Button"; import Button from "../../../../components/ui/Button";
import Overline from "../../../ui/Overline";
import Preloader from "../../../ui/Preloader"; import Preloader from "../../../ui/Preloader";
const EmbedInviteBase = styled.div` const EmbedInviteBase = styled.div`
@ -31,15 +33,37 @@ const EmbedInviteBase = styled.div`
align-items: center; align-items: center;
padding: 0 12px; padding: 0 12px;
margin-top: 2px; margin-top: 2px;
${() =>
isTouchscreenDevice &&
css`
flex-wrap: wrap;
height: 130px;
padding-top: 8px;
padding-bottom: 10px;
width: 100%;
> button {
width: 100%;
}
`
}
`; `;
const EmbedInviteDetails = styled.div` const EmbedInviteDetails = styled.div`
flex-grow: 1; flex-grow: 1;
padding-left: 12px; padding-left: 12px;
${() =>
isTouchscreenDevice &&
css`
width: calc(100% - 55px);
`
}
`; `;
const EmbedInviteName = styled.div` const EmbedInviteName = styled.div`
font-weight: bold; font-weight: bold;
line-height: 1rem;
max-height: 2rem;
overflow: hidden;
`; `;
const EmbedInviteMemberCount = styled.div` const EmbedInviteMemberCount = styled.div`
@ -57,6 +81,7 @@ export function EmbedInvite(props: Props) {
const code = props.code; const code = props.code;
const [processing, setProcessing] = useState(false); const [processing, setProcessing] = useState(false);
const [error, setError] = useState<string | undefined>(undefined); const [error, setError] = useState<string | undefined>(undefined);
const [joinError, setJoinError] = useState<string | undefined>(undefined);
const [invite, setInvite] = useState<RetrievedInvite | undefined>( const [invite, setInvite] = useState<RetrievedInvite | undefined>(
undefined, undefined,
); );
@ -89,68 +114,70 @@ export function EmbedInvite(props: Props) {
} }
return ( return (
<EmbedInviteBase> <>
<ServerIcon <EmbedInviteBase>
attachment={invite.server_icon} <ServerIcon
server_name={invite.server_name} attachment={invite.server_icon}
size={55} server_name={invite.server_name}
/> size={55}
<EmbedInviteDetails> />
<EmbedInviteName>{invite.server_name}</EmbedInviteName> <EmbedInviteDetails>
<EmbedInviteMemberCount> <EmbedInviteName>{invite.server_name}</EmbedInviteName>
{invite.member_count.toLocaleString()} members <EmbedInviteMemberCount>
</EmbedInviteMemberCount> {invite.member_count.toLocaleString()} {invite.member_count === 1 ? "member" : "members"}
</EmbedInviteDetails> </EmbedInviteMemberCount>
{processing ? ( </EmbedInviteDetails>
<div> {processing ? (
<Preloader type="ring" /> <div>
</div> <Preloader type="ring" />
) : ( </div>
<Button ) : (
onClick={async () => { <Button
try { onClick={async () => {
setProcessing(true); try {
setProcessing(true);
if (invite.type === "Server") { if (invite.type === "Server") {
if (client.servers.get(invite.server_id)) { if (client.servers.get(invite.server_id)) {
history.push( history.push(
`/server/${invite.server_id}/channel/${invite.channel_id}`, `/server/${invite.server_id}/channel/${invite.channel_id}`,
); );
}
const dispose = autorun(() => {
const server = client.servers.get(
invite.server_id,
);
defer(() => {
if (server) {
dispatch({
type: "UNREADS_MARK_MULTIPLE_READ",
channels: server.channel_ids,
});
history.push(
`/server/${server._id}/channel/${invite.channel_id}`,
);
}
});
dispose();
});
} }
const dispose = autorun(() => { await client.joinInvite(code);
const server = client.servers.get( } catch (err) {
invite.server_id, setJoinError(takeError(err));
); setProcessing(false);
defer(() => {
if (server) {
dispatch({
type: "UNREADS_MARK_MULTIPLE_READ",
channels: server.channel_ids,
});
history.push(
`/server/${server._id}/channel/${invite.channel_id}`,
);
}
});
dispose();
});
} }
}}>
await client.joinInvite(code); {client.servers.get(invite.server_id) ? "Joined" : "Join"}
setProcessing(false); </Button>
} catch (err) { )}
setError(takeError(err)); </EmbedInviteBase>
setProcessing(false); {joinError && <Overline type="error" error={joinError} />}
} </>
}}>
{client.servers.get(invite.server_id) ? "Joined" : "Join"}
</Button>
)}
</EmbedInviteBase>
); );
} }