Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 1570 additions and 823 deletions
src/components/common/IconBase.tsx
View file @ 1ac5de17
import { Attachment } from "revolt.js/dist/api/objects"; import { Attachment } from "revolt-api/types/Autumn";
import styled, { css } from "styled-components"; import styled, { css } from "styled-components";
export interface IconBaseProps<T> { export interface IconBaseProps<T> {
...@@ -6,11 +6,13 @@ export interface IconBaseProps<T> { ...@@ -6,11 +6,13 @@ export interface IconBaseProps<T> {
attachment?: Attachment; attachment?: Attachment;
size: number; size: number;
hover?: boolean;
animate?: boolean; animate?: boolean;
} }
interface IconModifiers { interface IconModifiers {
square?: boolean square?: boolean;
hover?: boolean;
} }
export default styled.svg<IconModifiers>` export default styled.svg<IconModifiers>`
...@@ -21,17 +23,37 @@ export default styled.svg<IconModifiers>` ...@@ -21,17 +23,37 @@ export default styled.svg<IconModifiers>`
height: 100%; height: 100%;
object-fit: cover; object-fit: cover;
${ props => !props.square && css` ${(props) =>
border-radius: 50%; !props.square &&
` } css`
border-radius: 50%;
`}
} }
${(props) =>
props.hover &&
css`
&:hover .icon {
filter: brightness(0.8);
}
`}
`; `;
export const ImageIconBase = styled.img<IconModifiers>` export const ImageIconBase = styled.img<IconModifiers>`
flex-shrink: 0; flex-shrink: 0;
object-fit: cover; object-fit: cover;
${ props => !props.square && css` ${(props) =>
border-radius: 50%; !props.square &&
` } css`
border-radius: 50%;
`}
${(props) =>
props.hover &&
css`
&:hover img {
filter: brightness(0.8);
}
`}
`; `;
src/components/common/LocaleSelector.tsx
View file @ 1ac5de17
import ComboBox from "../ui/ComboBox";
import { dispatch } from "../../redux"; import { dispatch } from "../../redux";
import { connectState } from "../../redux/connector"; import { connectState } from "../../redux/connector";
import { LanguageEntry, Languages } from "../../context/Locale";
import { Language, Languages } from "../../context/Locale";
import ComboBox from "../ui/ComboBox";
type Props = { type Props = {
locale: string; locale: string;
...@@ -11,17 +13,16 @@ export function LocaleSelector(props: Props) { ...@@ -11,17 +13,16 @@ export function LocaleSelector(props: Props) {
return ( return (
<ComboBox <ComboBox
value={props.locale} value={props.locale}
onChange={e => onChange={(e) =>
dispatch({ dispatch({
type: "SET_LOCALE", type: "SET_LOCALE",
locale: e.currentTarget.value as any locale: e.currentTarget.value as Language,
}) })
} }>
> {Object.keys(Languages).map((x) => {
{Object.keys(Languages).map(x => { const l = Languages[x as keyof typeof Languages];
const l = (Languages as any)[x] as LanguageEntry;
return ( return (
<option value={x}> <option value={x} key={x}>
{l.emoji} {l.display} {l.emoji} {l.display}
</option> </option>
); );
...@@ -30,11 +31,8 @@ export function LocaleSelector(props: Props) { ...@@ -30,11 +31,8 @@ export function LocaleSelector(props: Props) {
); );
} }
export default connectState( export default connectState(LocaleSelector, (state) => {
LocaleSelector, return {
state => { locale: state.locale,
return { };
locale: state.locale });
};
}
);
src/components/common/ServerHeader.tsx
View file @ 1ac5de17
import Header from "../ui/Header";
import styled from "styled-components";
import { Link } from "react-router-dom";
import IconButton from "../ui/IconButton";
import { Cog } from "@styled-icons/boxicons-solid"; import { Cog } from "@styled-icons/boxicons-solid";
import { Server } from "revolt.js/dist/api/objects"; import { observer } from "mobx-react-lite";
import { Link } from "react-router-dom";
import { ServerPermission } from "revolt.js/dist/api/permissions"; import { ServerPermission } from "revolt.js/dist/api/permissions";
import { HookContext, useServerPermission } from "../../context/revoltjs/hooks"; import { Server } from "revolt.js/dist/maps/Servers";
import styled from "styled-components";
import Header from "../ui/Header";
import IconButton from "../ui/IconButton";
interface Props { interface Props {
server: Server, server: Server;
ctx: HookContext
} }
const ServerName = styled.div` const ServerName = styled.div`
flex-grow: 1; flex-grow: 1;
`; `;
export default function ServerHeader({ server, ctx }: Props) { export default observer(({ server }: Props) => {
const permissions = useServerPermission(server._id, ctx); const bannerURL = server.generateBannerURL({ width: 480 });
const bannerURL = ctx.client.servers.getBannerURL(server._id, { width: 480 }, true);
return ( return (
<Header borders <Header
borders
placement="secondary" placement="secondary"
background={typeof bannerURL !== 'undefined'} background={typeof bannerURL !== "undefined"}
style={{ background: bannerURL ? `url('${bannerURL}')` : undefined }}> style={{
<ServerName> background: bannerURL ? `url('${bannerURL}')` : undefined,
{ server.name } }}>
</ServerName> <ServerName>{server.name}</ServerName>
{ (permissions & ServerPermission.ManageServer) > 0 && <div className="actions"> {(server.permission & ServerPermission.ManageServer) > 0 && (
<Link to={`/server/${server._id}/settings`}> <div className="actions">
<IconButton> <Link to={`/server/${server._id}/settings`}>
<Cog size={24} /> <IconButton>
</IconButton> <Cog size={24} />
</Link> </IconButton>
</div> } </Link>
</div>
)}
</Header> </Header>
) );
} });
src/components/common/ServerIcon.tsx
View file @ 1ac5de17
import { observer } from "mobx-react-lite";
import { Server } from "revolt.js/dist/maps/Servers";
import styled from "styled-components"; import styled from "styled-components";
import { useContext } from "preact/hooks"; import { useContext } from "preact/hooks";
import { Server } from "revolt.js/dist/api/objects";
import { IconBaseProps, ImageIconBase } from "./IconBase";
import { AppContext } from "../../context/revoltjs/RevoltClient"; import { AppContext } from "../../context/revoltjs/RevoltClient";
import { IconBaseProps, ImageIconBase } from "./IconBase";
interface Props extends IconBaseProps<Server> { interface Props extends IconBaseProps<Server> {
server_name?: string; server_name?: string;
} }
const ServerText = styled.div` const ServerText = styled.div`
display: grid; display: grid;
padding: .2em; padding: 0.2em;
overflow: hidden; overflow: hidden;
border-radius: 50%; border-radius: 50%;
place-items: center; place-items: center;
...@@ -18,30 +22,47 @@ const ServerText = styled.div` ...@@ -18,30 +22,47 @@ const ServerText = styled.div`
background: var(--primary-background); background: var(--primary-background);
`; `;
const fallback = '/assets/group.png'; // const fallback = "/assets/group.png";
export default function ServerIcon(props: Props & Omit<JSX.HTMLAttributes<HTMLImageElement>, keyof Props>) { export default observer(
const client = useContext(AppContext); (
props: Props &
Omit<
JSX.HTMLAttributes<HTMLImageElement>,
keyof Props | "children" | "as"
>,
) => {
const client = useContext(AppContext);
const { target, attachment, size, animate, server_name, ...imgProps } =
props;
const iconURL = client.generateFileURL(
target?.icon ?? attachment,
{ max_side: 256 },
animate,
);
const { target, attachment, size, animate, server_name, children, as, ...imgProps } = props; if (typeof iconURL === "undefined") {
const iconURL = client.generateFileURL(target?.icon ?? attachment, { max_side: 256 }, animate); const name = target?.name ?? server_name ?? "";
if (typeof iconURL === 'undefined') { return (
const name = target?.name ?? server_name ?? ''; <ServerText style={{ width: size, height: size }}>
{name
.split(" ")
.map((x) => x[0])
.filter((x) => typeof x !== "undefined")}
</ServerText>
);
}
return ( return (
<ServerText style={{ width: size, height: size }}> <ImageIconBase
{ name.split(' ') {...imgProps}
.map(x => x[0]) width={size}
.filter(x => typeof x !== 'undefined') } height={size}
</ServerText> src={iconURL}
) loading="lazy"
} aria-hidden="true"
/>
return ( );
<ImageIconBase {...imgProps} },
width={size} );
height={size}
aria-hidden="true"
src={iconURL} />
);
}
src/components/common/Tooltip.tsx
View file @ 1ac5de17
import { Text } from "preact-i18n"; import Tippy, { TippyProps } from "@tippyjs/react";
import styled from "styled-components"; import styled from "styled-components";
import { Text } from "preact-i18n";
import { Children } from "../../types/Preact"; import { Children } from "../../types/Preact";
import Tippy, { TippyProps } from '@tippyjs/react';
type Props = Omit<TippyProps, 'children'> & { type Props = Omit<TippyProps, "children"> & {
children: Children; children: Children;
content: Children; content: Children;
} };
export default function Tooltip(props: Props) { export default function Tooltip(props: Props) {
const { children, content, ...tippyProps } = props; const { children, content, ...tippyProps } = props;
...@@ -14,8 +16,8 @@ export default function Tooltip(props: Props) { ...@@ -14,8 +16,8 @@ export default function Tooltip(props: Props) {
return ( return (
<Tippy content={content} {...tippyProps}> <Tippy content={content} {...tippyProps}>
{/* {/*
// @ts-expect-error */} // @ts-expect-error Type mis-match. */}
<div>{ children }</div> <div style={`display: flex;`}>{children}</div>
</Tippy> </Tippy>
); );
} }
...@@ -24,7 +26,7 @@ const PermissionTooltipBase = styled.div` ...@@ -24,7 +26,7 @@ const PermissionTooltipBase = styled.div`
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
span { span {
font-weight: 700; font-weight: 700;
text-transform: uppercase; text-transform: uppercase;
...@@ -33,17 +35,26 @@ const PermissionTooltipBase = styled.div` ...@@ -33,17 +35,26 @@ const PermissionTooltipBase = styled.div`
} }
code { code {
font-family: var(--monoscape-font); font-family: var(--monospace-font);
} }
`; `;
export function PermissionTooltip(props: Omit<Props, 'content'> & { permission: string }) { export function PermissionTooltip(
props: Omit<Props, "content"> & { permission: string },
) {
const { permission, ...tooltipProps } = props; const { permission, ...tooltipProps } = props;
return ( return (
<Tooltip content={<PermissionTooltipBase> <Tooltip
<span><Text id="app.permissions.required" /></span> content={
<code>{ permission }</code> <PermissionTooltipBase>
</PermissionTooltipBase>} {...tooltipProps} /> <span>
) <Text id="app.permissions.required" />
</span>
<code>{permission}</code>
</PermissionTooltipBase>
}
{...tooltipProps}
/>
);
} }
src/components/common/UpdateIndicator.tsx
View file @ 1ac5de17
import { updateSW } from "../../main"; /* eslint-disable react-hooks/rules-of-hooks */
import IconButton from "../ui/IconButton"; import { Download, CloudDownload } from "@styled-icons/boxicons-regular";
import { ThemeContext } from "../../context/Theme";
import { Download } from "@styled-icons/boxicons-regular";
import { internalSubscribe } from "../../lib/eventEmitter";
import { useContext, useEffect, useState } from "preact/hooks"; import { useContext, useEffect, useState } from "preact/hooks";
var pendingUpdate = false; import { internalSubscribe } from "../../lib/eventEmitter";
internalSubscribe('PWA', 'update', () => pendingUpdate = true);
import { ThemeContext } from "../../context/Theme";
export default function UpdateIndicator() { import IconButton from "../ui/IconButton";
const [ pending, setPending ] = useState(pendingUpdate);
import { updateSW } from "../../main";
import Tooltip from "./Tooltip";
let pendingUpdate = false;
internalSubscribe("PWA", "update", () => (pendingUpdate = true));
interface Props {
style: "titlebar" | "channel";
}
export default function UpdateIndicator({ style }: Props) {
const [pending, setPending] = useState(pendingUpdate);
useEffect(() => { useEffect(() => {
return internalSubscribe('PWA', 'update', () => setPending(true)); return internalSubscribe("PWA", "update", () => setPending(true));
}); });
if (!pending) return null; if (!pending) return null;
const theme = useContext(ThemeContext); const theme = useContext(ThemeContext);
if (style === "titlebar") {
return (
<div class="actions">
<Tooltip
content="A new update is available!"
placement="bottom">
<div onClick={() => updateSW(true)}>
<CloudDownload size={22} color={theme.success} />
</div>
</Tooltip>
</div>
);
}
if (window.isNative) return null;
return ( return (
<IconButton onClick={() => updateSW(true)}> <IconButton onClick={() => updateSW(true)}>
<Download size={22} color={theme.success} /> <Download size={22} color={theme.success} />
</IconButton> </IconButton>
) );
} }
src/components/common/messaging/Message.tsx
View file @ 1ac5de17
import Embed from "./embed/Embed"; import { observer } from "mobx-react-lite";
import UserIcon from "../user/UserIcon"; import { Message as MessageObject } from "revolt.js/dist/maps/Messages";
import { Username } from "../user/UserShort";
import Markdown from "../../markdown/Markdown";
import { Children } from "../../../types/Preact";
import Attachment from "./attachments/Attachment";
import { attachContextMenu } from "preact-context-menu"; import { attachContextMenu } from "preact-context-menu";
import { useUser } from "../../../context/revoltjs/hooks"; import { memo } from "preact/compat";
import { useState } from "preact/hooks";
import { QueuedMessage } from "../../../redux/reducers/queue"; import { QueuedMessage } from "../../../redux/reducers/queue";
import { MessageObject } from "../../../context/revoltjs/util";
import MessageBase, { MessageContent, MessageDetail, MessageInfo } from "./MessageBase"; import { useIntermediate } from "../../../context/intermediate/Intermediate";
import { useClient } from "../../../context/revoltjs/RevoltClient";
import Overline from "../../ui/Overline"; import Overline from "../../ui/Overline";
import { useContext } from "preact/hooks";
import { AppContext } from "../../../context/revoltjs/RevoltClient"; import { Children } from "../../../types/Preact";
import { memo } from "preact/compat"; import Markdown from "../../markdown/Markdown";
import UserIcon from "../user/UserIcon";
import { Username } from "../user/UserShort";
import MessageBase, {
MessageContent,
MessageDetail,
MessageInfo,
} from "./MessageBase";
import Attachment from "./attachments/Attachment";
import { MessageReply } from "./attachments/MessageReply"; import { MessageReply } from "./attachments/MessageReply";
import { useIntermediate } from "../../../context/intermediate/Intermediate"; import Embed from "./embed/Embed";
interface Props { interface Props {
attachContext?: boolean attachContext?: boolean;
queued?: QueuedMessage queued?: QueuedMessage;
message: MessageObject message: MessageObject;
contrast?: boolean highlight?: boolean;
content?: Children contrast?: boolean;
head?: boolean content?: Children;
head?: boolean;
} }
function Message({ attachContext, message, contrast, content: replacement, head: preferHead, queued }: Props) { const Message = observer(
// TODO: Can improve re-renders here by providing a list ({
// TODO: of dependencies. We only need to update on u/avatar. highlight,
const user = useUser(message.author); attachContext,
const client = useContext(AppContext); message,
const { openScreen } = useIntermediate(); contrast,
content: replacement,
head: preferHead,
queued,
}: Props) => {
const client = useClient();
const user = message.author;
const content = message.content as string; const { openScreen } = useIntermediate();
const head = preferHead || (message.replies && message.replies.length > 0);
const userContext = attachContext ? attachContextMenu('Menu', { user: message.author, contextualChannel: message.channel }) : undefined as any; // ! FIXME: tell fatal to make this type generic const content = message.content as string;
const openProfile = () => openScreen({ id: 'profile', user_id: message.author }); const head =
preferHead || (message.reply_ids && message.reply_ids.length > 0);
return ( // ! TODO: tell fatal to make this type generic
<div id={message._id}> // bree: Fatal please...
{ message.replies?.map((message_id, index) => <MessageReply index={index} id={message_id} channel={message.channel} />) } const userContext = attachContext
<MessageBase ? (attachContextMenu("Menu", {
head={head && !(message.replies && message.replies.length > 0)} user: message.author_id,
contrast={contrast} contextualChannel: message.channel_id,
sending={typeof queued !== 'undefined'} // eslint-disable-next-line
mention={message.mentions?.includes(client.user!._id)} }) as any)
failed={typeof queued?.error !== 'undefined'} : undefined;
onContextMenu={attachContext ? attachContextMenu('Menu', { message, contextualChannel: message.channel, queued }) : undefined}>
<MessageInfo> const openProfile = () =>
{ head ? openScreen({ id: "profile", user_id: message.author_id });
<UserIcon target={user} size={36} onContextMenu={userContext} onClick={openProfile} /> :
<MessageDetail message={message} position="left" /> } // ! FIXME(?): animate on hover
</MessageInfo> const [animate, setAnimate] = useState(false);
<MessageContent>
{ head && <span className="detail"> return (
<Username className="author" user={user} onContextMenu={userContext} onClick={openProfile} /> <div id={message._id}>
<MessageDetail message={message} position="top" /> {message.reply_ids?.map((message_id, index) => (
</span> } <MessageReply
{ replacement ?? <Markdown content={content} /> } key={message_id}
{ queued?.error && <Overline type="error" error={queued.error} /> } index={index}
{ message.attachments?.map((attachment, index) => id={message_id}
<Attachment key={index} attachment={attachment} hasContent={ index > 0 || content.length > 0 } />) } channel={message.channel!}
{ message.embeds?.map((embed, index) => />
<Embed key={index} embed={embed} />) } ))}
</MessageContent> <MessageBase
</MessageBase> highlight={highlight}
</div> head={
) (head &&
} !(
message.reply_ids &&
message.reply_ids.length > 0
)) ??
false
}
contrast={contrast}
sending={typeof queued !== "undefined"}
mention={message.mention_ids?.includes(client.user!._id)}
failed={typeof queued?.error !== "undefined"}
onContextMenu={
attachContext
? attachContextMenu("Menu", {
message,
contextualChannel: message.channel_id,
queued,
})
: undefined
}
onMouseEnter={() => setAnimate(true)}
onMouseLeave={() => setAnimate(false)}>
<MessageInfo>
{head ? (
<UserIcon
target={user}
size={36}
onContextMenu={userContext}
onClick={openProfile}
animate={animate}
/>
) : (
<MessageDetail message={message} position="left" />
)}
</MessageInfo>
<MessageContent>
{head && (
<span className="detail">
<Username
className="author"
user={user}
onContextMenu={userContext}
onClick={openProfile}
/>
<MessageDetail
message={message}
position="top"
/>
</span>
)}
{replacement ?? <Markdown content={content} />}
{queued?.error && (
<Overline type="error" error={queued.error} />
)}
{message.attachments?.map((attachment, index) => (
<Attachment
key={index}
attachment={attachment}
hasContent={index > 0 || content.length > 0}
/>
))}
{message.embeds?.map((embed, index) => (
<Embed key={index} embed={embed} />
))}
</MessageContent>
</MessageBase>
</div>
);
},
);
export default memo(Message); export default memo(Message);
src/components/common/messaging/MessageBase.tsx
View file @ 1ac5de17
import dayjs from "dayjs"; import { observer } from "mobx-react-lite";
import Tooltip from "../Tooltip"; import { Message } from "revolt.js/dist/maps/Messages";
import styled, { css, keyframes } from "styled-components";
import { decodeTime } from "ulid"; import { decodeTime } from "ulid";
import { Text } from "preact-i18n"; import { Text } from "preact-i18n";
import styled, { css } from "styled-components";
import { MessageObject } from "../../../context/revoltjs/util"; import { useDictionary } from "../../../lib/i18n";
import { dayjs } from "../../../context/Locale";
import Tooltip from "../Tooltip";
export interface BaseMessageProps { export interface BaseMessageProps {
head?: boolean, head?: boolean;
failed?: boolean, failed?: boolean;
mention?: boolean, mention?: boolean;
blocked?: boolean, blocked?: boolean;
sending?: boolean, sending?: boolean;
contrast?: boolean contrast?: boolean;
highlight?: boolean;
} }
const highlight = keyframes`
0% { background: var(--mention); }
66% { background: var(--mention); }
100% { background: transparent; }
`;
export default styled.div<BaseMessageProps>` export default styled.div<BaseMessageProps>`
display: flex; display: flex;
overflow-x: none; overflow: none;
padding: .125rem; padding: 0.125rem;
flex-direction: row; flex-direction: row;
padding-right: 16px; padding-inline-end: 16px;
${ props => props.contrast && css` @media (pointer: coarse) {
padding: .3rem; user-select: none;
border-radius: 4px; }
background: var(--hover);
` }
${ props => props.head && css` ${(props) =>
margin-top: 12px; props.contrast &&
` } css`
padding: 0.3rem;
background: var(--hover);
border-radius: var(--border-radius);
`}
${ props => props.mention && css` ${(props) =>
background: var(--mention); props.head &&
` } css`
margin-top: 12px;
`}
${ props => props.blocked && css` ${(props) =>
filter: blur(4px); props.mention &&
transition: 0.2s ease filter; css`
background: var(--mention);
`}
&:hover { ${(props) =>
filter: none; props.blocked &&
} css`
` } filter: blur(4px);
transition: 0.2s ease filter;
${ props => props.sending && css` &:hover {
opacity: 0.8; filter: none;
color: var(--tertiary-foreground); }
` } `}
${(props) =>
props.sending &&
css`
opacity: 0.8;
color: var(--tertiary-foreground);
`}
${(props) =>
props.failed &&
css`
color: var(--error);
`}
${ props => props.failed && css` ${(props) =>
color: var(--error); props.highlight &&
` } css`
animation-name: ${highlight};
animation-timing-function: ease;
animation-duration: 3s;
`}
.detail { .detail {
gap: 8px; gap: 8px;
display: flex; display: flex;
align-items: center; align-items: center;
flex-shrink: 0;
} }
.author { .author {
overflow: hidden;
cursor: pointer; cursor: pointer;
font-weight: 600 !important; font-weight: 600 !important;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
text-overflow: ellipsis;
white-space: normal;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
} }
} }
.copy { .copy {
display: block; display: block;
overflow: hidden; overflow: hidden;
...@@ -113,7 +158,8 @@ export const MessageInfo = styled.div` ...@@ -113,7 +158,8 @@ export const MessageInfo = styled.div`
opacity: 0; opacity: 0;
} }
time, .edited { time,
.edited {
margin-top: 1px; margin-top: 1px;
cursor: default; cursor: default;
display: inline; display: inline;
...@@ -121,12 +167,17 @@ export const MessageInfo = styled.div` ...@@ -121,12 +167,17 @@ export const MessageInfo = styled.div`
color: var(--tertiary-foreground); color: var(--tertiary-foreground);
} }
time, .edited > div { time,
.edited > div {
&::selection { &::selection {
background-color: transparent; background-color: transparent;
color: var(--tertiary-foreground); color: var(--tertiary-foreground);
} }
} }
.header {
cursor: pointer;
}
`; `;
export const MessageContent = styled.div` export const MessageContent = styled.div`
...@@ -134,56 +185,75 @@ export const MessageContent = styled.div` ...@@ -134,56 +185,75 @@ export const MessageContent = styled.div`
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
// overflow: hidden; // overflow: hidden;
font-size: .875rem;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
font-size: var(--text-size);
`; `;
export const DetailBase = styled.div` export const DetailBase = styled.div`
flex-shrink: 0;
gap: 4px; gap: 4px;
font-size: 10px; font-size: 10px;
display: inline-flex; display: inline-flex;
color: var(--tertiary-foreground); color: var(--tertiary-foreground);
.edited {
cursor: default;
&::selection {
background-color: transparent;
color: var(--tertiary-foreground);
}
}
`; `;
export function MessageDetail({ message, position }: { message: MessageObject, position: 'left' | 'top' }) { export const MessageDetail = observer(
if (position === 'left') { ({ message, position }: { message: Message; position: "left" | "top" }) => {
if (message.edited) { const dict = useDictionary();
return (
<> if (position === "left") {
<time className="copyTime"> if (message.edited) {
<i className="copyBracket">[</i> return (
{dayjs(decodeTime(message._id)).format("H:mm")} <>
<i className="copyBracket">]</i> <time className="copyTime">
</time> <i className="copyBracket">[</i>
<span className="edited"> {dayjs(decodeTime(message._id)).format(
<Tooltip content={dayjs(message.edited).format("LLLL")}> dict.dayjs?.timeFormat,
<Text id="app.main.channel.edited" /> )}
</Tooltip> <i className="copyBracket">]</i>
</span> </time>
</> <span className="edited">
) <Tooltip
} else { content={dayjs(message.edited).format("LLLL")}>
<Text id="app.main.channel.edited" />
</Tooltip>
</span>
</>
);
}
return ( return (
<> <>
<time> <time>
<i className="copyBracket">[</i> <i className="copyBracket">[</i>
{ dayjs(decodeTime(message._id)).format("H:mm") } {dayjs(decodeTime(message._id)).format(
dict.dayjs?.timeFormat,
)}
<i className="copyBracket">]</i> <i className="copyBracket">]</i>
</time> </time>
</> </>
) );
} }
}
return ( return (
<DetailBase> <DetailBase>
<time> <time>{dayjs(decodeTime(message._id)).calendar()}</time>
{dayjs(decodeTime(message._id)).calendar()} {message.edited && (
</time> <Tooltip content={dayjs(message.edited).format("LLLL")}>
{ message.edited && <Tooltip content={dayjs(message.edited).format("LLLL")}> <span className="edited">
<Text id="app.main.channel.edited" /> <Text id="app.main.channel.edited" />
</Tooltip> } </span>
</DetailBase> </Tooltip>
) )}
} </DetailBase>
);
},
);
src/components/common/messaging/MessageBox.tsx
View file @ 1ac5de17
import { Send, ShieldX } from "@styled-icons/boxicons-solid";
import Axios, { CancelTokenSource } from "axios";
import { observer } from "mobx-react-lite";
import { ChannelPermission } from "revolt.js/dist/api/permissions";
import { Channel } from "revolt.js/dist/maps/Channels";
import styled from "styled-components";
import { ulid } from "ulid"; import { ulid } from "ulid";
import { Text } from "preact-i18n"; import { Text } from "preact-i18n";
import { Channel } from "revolt.js"; import { useCallback, useContext, useEffect, useState } from "preact/hooks";
import styled from "styled-components";
import { dispatch } from "../../../redux"; import TextAreaAutoSize from "../../../lib/TextAreaAutoSize";
import { defer } from "../../../lib/defer";
import IconButton from "../../ui/IconButton";
import { PermissionTooltip } from "../Tooltip";
import { Send } from '@styled-icons/boxicons-solid';
import { debounce } from "../../../lib/debounce"; import { debounce } from "../../../lib/debounce";
import Axios, { CancelTokenSource } from "axios"; import { defer } from "../../../lib/defer";
import { internalEmit, internalSubscribe } from "../../../lib/eventEmitter";
import { useTranslation } from "../../../lib/i18n"; import { useTranslation } from "../../../lib/i18n";
import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
import {
SingletonMessageRenderer,
SMOOTH_SCROLL_ON_RECEIVE,
} from "../../../lib/renderer/Singleton";
import { dispatch, getState } from "../../../redux";
import { Reply } from "../../../redux/reducers/queue"; import { Reply } from "../../../redux/reducers/queue";
import { connectState } from "../../../redux/connector";
import { SoundContext } from "../../../context/Settings"; import { SoundContext } from "../../../context/Settings";
import { takeError } from "../../../context/revoltjs/util";
import TextAreaAutoSize from "../../../lib/TextAreaAutoSize";
import AutoComplete, { useAutoComplete } from "../AutoComplete";
import { ChannelPermission } from "revolt.js/dist/api/permissions";
import { AppContext } from "../../../context/revoltjs/RevoltClient";
import { useChannelPermission } from "../../../context/revoltjs/hooks";
import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
import { internalEmit, internalSubscribe } from "../../../lib/eventEmitter";
import { useCallback, useContext, useEffect, useState } from "preact/hooks";
import { useIntermediate } from "../../../context/intermediate/Intermediate"; import { useIntermediate } from "../../../context/intermediate/Intermediate";
import { FileUploader, grabFiles, uploadFile } from "../../../context/revoltjs/FileUploads"; import {
import { SingletonMessageRenderer, SMOOTH_SCROLL_ON_RECEIVE } from "../../../lib/renderer/Singleton"; FileUploader,
import { ShieldX } from "@styled-icons/boxicons-regular"; grabFiles,
uploadFile,
} from "../../../context/revoltjs/FileUploads";
import { AppContext } from "../../../context/revoltjs/RevoltClient";
import { takeError } from "../../../context/revoltjs/util";
import IconButton from "../../ui/IconButton";
import AutoComplete, { useAutoComplete } from "../AutoComplete";
import { PermissionTooltip } from "../Tooltip";
import FilePreview from "./bars/FilePreview";
import ReplyBar from "./bars/ReplyBar"; import ReplyBar from "./bars/ReplyBar";
import FilePreview from './bars/FilePreview';
type Props = { type Props = {
channel: Channel; channel: Channel;
draft?: string;
}; };
export type UploadState = export type UploadState =
| { type: "none" } | { type: "none" }
| { type: "attached"; files: File[] } | { type: "attached"; files: File[] }
| { type: "uploading"; files: File[]; percent: number; cancel: CancelTokenSource } | {
type: "uploading";
files: File[];
percent: number;
cancel: CancelTokenSource;
}
| { type: "sending"; files: File[] } | { type: "sending"; files: File[] }
| { type: "failed"; files: File[]; error: string }; | { type: "failed"; files: File[]; error: string };
const Base = styled.div` const Base = styled.div`
display: flex; display: flex;
padding: 0 12px; align-items: flex-start;
background: var(--message-box); background: var(--message-box);
textarea { textarea {
font-size: .875rem; font-size: var(--text-size);
background: transparent; background: transparent;
&::placeholder {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
} }
`; `;
const Blocked = styled.div` const Blocked = styled.div`
display: flex; display: flex;
align-items: center; align-items: center;
padding: 14px 0;
user-select: none; user-select: none;
font-size: .875rem; font-size: var(--text-size);
color: var(--tertiary-foreground); color: var(--tertiary-foreground);
.text {
padding: 14px 14px 14px 0;
}
svg { svg {
flex-shrink: 0; flex-shrink: 0;
margin-inline-end: 10px;
} }
`; `;
const Action = styled.div` const Action = styled.div`
display: grid; display: flex;
place-items: center; place-items: center;
> div {
height: 48px;
width: 48px;
padding: 12px;
}
.mobile {
@media (pointer: fine) {
display: none;
}
}
`; `;
// ! FIXME: add to app config and load from app config // ! FIXME: add to app config and load from app config
export const CAN_UPLOAD_AT_ONCE = 5; export const CAN_UPLOAD_AT_ONCE = 4;
export default observer(({ channel }: Props) => {
const [draft, setDraft] = useState(getState().drafts[channel._id] ?? "");
function MessageBox({ channel, draft }: Props) { const [uploadState, setUploadState] = useState<UploadState>({
const [ uploadState, setUploadState ] = useState<UploadState>({ type: 'none' }); type: "none",
const [ typing, setTyping ] = useState<boolean | number>(false); });
const [ replies, setReplies ] = useState<Reply[]>([]); const [typing, setTyping] = useState<boolean | number>(false);
const [replies, setReplies] = useState<Reply[]>([]);
const playSound = useContext(SoundContext); const playSound = useContext(SoundContext);
const { openScreen } = useIntermediate(); const { openScreen } = useIntermediate();
const client = useContext(AppContext); const client = useContext(AppContext);
const translate = useTranslation(); const translate = useTranslation();
const permissions = useChannelPermission(channel._id); if (!(channel.permission & ChannelPermission.SendMessage)) {
if (!(permissions & ChannelPermission.SendMessage)) {
return ( return (
<Base> <Base>
<Blocked> <Blocked>
<PermissionTooltip permission="SendMessages" placement="top"> <Action>
<ShieldX size={22}/> <PermissionTooltip
</PermissionTooltip> permission="SendMessages"
<Text id="app.main.channel.misc.no_sending" /> placement="top">
<ShieldX size={22} />
</PermissionTooltip>
</Action>
<div className="text">
<Text id="app.main.channel.misc.no_sending" />
</div>
</Blocked> </Blocked>
</Base> </Base>
) );
} }
function setMessage(content?: string) { const setMessage = useCallback(
if (content) { (content?: string) => {
dispatch({ setDraft(content ?? "");
type: "SET_DRAFT",
channel: channel._id, if (content) {
content dispatch({
}); type: "SET_DRAFT",
} else { channel: channel._id,
dispatch({ content,
type: "CLEAR_DRAFT", });
channel: channel._id } else {
}); dispatch({
} type: "CLEAR_DRAFT",
} channel: channel._id,
});
}
},
[channel._id],
);
useEffect(() => { useEffect(() => {
function append(content: string, action: 'quote' | 'mention') { function append(content: string, action: "quote" | "mention") {
const text = const text =
action === "quote" action === "quote"
? `${content ? `${content
.split("\n") .split("\n")
.map(x => `> ${x}`) .map((x) => `> ${x}`)
.join("\n")}\n\n` .join("\n")}\n\n`
: `${content} `; : `${content} `;
...@@ -130,20 +178,25 @@ function MessageBox({ channel, draft }: Props) { ...@@ -130,20 +178,25 @@ function MessageBox({ channel, draft }: Props) {
} }
} }
return internalSubscribe("MessageBox", "append", append); return internalSubscribe(
}, [ draft ]); "MessageBox",
"append",
append as (...args: unknown[]) => void,
);
}, [draft, setMessage]);
async function send() { async function send() {
if (uploadState.type === 'uploading' || uploadState.type === 'sending') return; if (uploadState.type === "uploading" || uploadState.type === "sending")
return;
const content = draft?.trim() ?? '';
if (uploadState.type === 'attached') return sendFile(content); const content = draft?.trim() ?? "";
if (uploadState.type === "attached") return sendFile(content);
if (content.length === 0) return; if (content.length === 0) return;
stopTyping(); stopTyping();
setMessage(); setMessage();
setReplies([]); setReplies([]);
playSound('outbound'); playSound("outbound");
const nonce = ulid(); const nonce = ulid();
dispatch({ dispatch({
...@@ -154,32 +207,37 @@ function MessageBox({ channel, draft }: Props) { ...@@ -154,32 +207,37 @@ function MessageBox({ channel, draft }: Props) {
_id: nonce, _id: nonce,
channel: channel._id, channel: channel._id,
author: client.user!._id, author: client.user!._id,
content, content,
replies replies,
} },
}); });
defer(() => SingletonMessageRenderer.jumpToBottom(channel._id, SMOOTH_SCROLL_ON_RECEIVE)); defer(() =>
SingletonMessageRenderer.jumpToBottom(
channel._id,
SMOOTH_SCROLL_ON_RECEIVE,
),
);
try { try {
await client.channels.sendMessage(channel._id, { await channel.sendMessage({
content, content,
nonce, nonce,
replies replies,
}); });
} catch (error) { } catch (error) {
dispatch({ dispatch({
type: "QUEUE_FAIL", type: "QUEUE_FAIL",
error: takeError(error), error: takeError(error),
nonce nonce,
}); });
} }
} }
async function sendFile(content: string) { async function sendFile(content: string) {
if (uploadState.type !== 'attached') return; if (uploadState.type !== "attached") return;
let attachments: string[] = []; const attachments: string[] = [];
const cancel = Axios.CancelToken.source(); const cancel = Axios.CancelToken.source();
const files = uploadState.files; const files = uploadState.files;
...@@ -187,32 +245,43 @@ function MessageBox({ channel, draft }: Props) { ...@@ -187,32 +245,43 @@ function MessageBox({ channel, draft }: Props) {
setUploadState({ type: "uploading", files, percent: 0, cancel }); setUploadState({ type: "uploading", files, percent: 0, cancel });
try { try {
for (let i=0;i<files.length&&i<CAN_UPLOAD_AT_ONCE;i++) { for (let i = 0; i < files.length && i < CAN_UPLOAD_AT_ONCE; i++) {
const file = files[i]; const file = files[i];
attachments.push( attachments.push(
await uploadFile(client.configuration!.features.autumn.url, 'attachments', file, { await uploadFile(
onUploadProgress: e => client.configuration!.features.autumn.url,
setUploadState({ "attachments",
type: "uploading", file,
files, {
percent: Math.round(((i * 100) + (100 * e.loaded) / e.total) / Math.min(files.length, CAN_UPLOAD_AT_ONCE)), onUploadProgress: (e) =>
cancel setUploadState({
}), type: "uploading",
cancelToken: cancel.token files,
}) percent: Math.round(
(i * 100 + (100 * e.loaded) / e.total) /
Math.min(
files.length,
CAN_UPLOAD_AT_ONCE,
),
),
cancel,
}),
cancelToken: cancel.token,
},
),
); );
} }
} catch (err) { } catch (err) {
if (err?.message === "cancel") { if (err?.message === "cancel") {
setUploadState({ setUploadState({
type: "attached", type: "attached",
files files,
}); });
} else { } else {
setUploadState({ setUploadState({
type: "failed", type: "failed",
files, files,
error: takeError(err) error: takeError(err),
}); });
} }
...@@ -221,22 +290,22 @@ function MessageBox({ channel, draft }: Props) { ...@@ -221,22 +290,22 @@ function MessageBox({ channel, draft }: Props) {
setUploadState({ setUploadState({
type: "sending", type: "sending",
files files,
}); });
const nonce = ulid(); const nonce = ulid();
try { try {
await client.channels.sendMessage(channel._id, { await channel.sendMessage({
content, content,
nonce, nonce,
replies, replies,
attachments attachments,
}); });
} catch (err) { } catch (err) {
setUploadState({ setUploadState({
type: "failed", type: "failed",
files, files,
error: takeError(err) error: takeError(err),
}); });
return; return;
...@@ -244,27 +313,27 @@ function MessageBox({ channel, draft }: Props) { ...@@ -244,27 +313,27 @@ function MessageBox({ channel, draft }: Props) {
setMessage(); setMessage();
setReplies([]); setReplies([]);
playSound('outbound'); playSound("outbound");
if (files.length > CAN_UPLOAD_AT_ONCE) { if (files.length > CAN_UPLOAD_AT_ONCE) {
setUploadState({ setUploadState({
type: "attached", type: "attached",
files: files.slice(CAN_UPLOAD_AT_ONCE) files: files.slice(CAN_UPLOAD_AT_ONCE),
}); });
} else { } else {
setUploadState({ type: "none" }); setUploadState({ type: "none" });
} }
} }
function startTyping() { function startTyping() {
if (typeof typing === 'number' && + new Date() < typing) return; if (typeof typing === "number" && +new Date() < typing) return;
const ws = client.websocket; const ws = client.websocket;
if (ws.connected) { if (ws.connected) {
setTyping(+ new Date() + 4000); setTyping(+new Date() + 2500);
ws.send({ ws.send({
type: "BeginTyping", type: "BeginTyping",
channel: channel._id channel: channel._id,
}); });
} }
} }
...@@ -276,69 +345,118 @@ function MessageBox({ channel, draft }: Props) { ...@@ -276,69 +345,118 @@ function MessageBox({ channel, draft }: Props) {
setTyping(false); setTyping(false);
ws.send({ ws.send({
type: "EndTyping", type: "EndTyping",
channel: channel._id channel: channel._id,
}); });
} }
} }
} }
const debouncedStopTyping = useCallback(debounce(stopTyping, 1000), [ channel._id ]); // eslint-disable-next-line
const { onChange, onKeyUp, onKeyDown, onFocus, onBlur, ...autoCompleteProps } = const debouncedStopTyping = useCallback(
useAutoComplete(setMessage, { debounce(stopTyping as (...args: unknown[]) => void, 1000),
users: { type: 'channel', id: channel._id }, [channel._id],
channels: channel.channel_type === 'TextChannel' ? { server: channel.server } : undefined );
}); const {
onChange,
onKeyUp,
onKeyDown,
onFocus,
onBlur,
...autoCompleteProps
} = useAutoComplete(setMessage, {
users: { type: "channel", id: channel._id },
channels:
channel.channel_type === "TextChannel"
? { server: channel.server_id! }
: undefined,
});
return ( return (
<> <>
<AutoComplete {...autoCompleteProps} /> <AutoComplete {...autoCompleteProps} />
<FilePreview state={uploadState} addFile={() => uploadState.type === 'attached' && <FilePreview
grabFiles(20_000_000, files => setUploadState({ type: 'attached', files: [ ...uploadState.files, ...files ] }), state={uploadState}
() => openScreen({ id: "error", error: "FileTooLarge" }), true)} addFile={() =>
removeFile={index => { uploadState.type === "attached" &&
if (uploadState.type !== 'attached') return; grabFiles(
20_000_000,
(files) =>
setUploadState({
type: "attached",
files: [...uploadState.files, ...files],
}),
() =>
openScreen({ id: "error", error: "FileTooLarge" }),
true,
)
}
removeFile={(index) => {
if (uploadState.type !== "attached") return;
if (uploadState.files.length === 1) { if (uploadState.files.length === 1) {
setUploadState({ type: 'none' }); setUploadState({ type: "none" });
} else { } else {
setUploadState({ type: 'attached', files: uploadState.files.filter((_, i) => index !== i) }); setUploadState({
type: "attached",
files: uploadState.files.filter(
(_, i) => index !== i,
),
});
} }
}} /> }}
<ReplyBar channel={channel._id} replies={replies} setReplies={setReplies} /> />
<ReplyBar
channel={channel._id}
replies={replies}
setReplies={setReplies}
/>
<Base> <Base>
{ (permissions & ChannelPermission.UploadFiles) ? <Action> {channel.permission & ChannelPermission.UploadFiles ? (
<FileUploader <Action>
size={24} <FileUploader
behaviour='multi' size={24}
style='attachment' behaviour="multi"
fileType='attachments' style="attachment"
maxFileSize={20_000_000} fileType="attachments"
maxFileSize={20_000_000}
attached={uploadState.type !== 'none'} attached={uploadState.type !== "none"}
uploading={uploadState.type === 'uploading' || uploadState.type === 'sending'} uploading={
uploadState.type === "uploading" ||
remove={async () => setUploadState({ type: "none" })} uploadState.type === "sending"
onChange={files => setUploadState({ type: "attached", files })}
cancel={() => uploadState.type === 'uploading' && uploadState.cancel.cancel("cancel")}
append={files => {
if (files.length === 0) return;
if (uploadState.type === 'none') {
setUploadState({ type: 'attached', files });
} else if (uploadState.type === 'attached') {
setUploadState({ type: 'attached', files: [ ...uploadState.files, ...files ] });
} }
}} remove={async () =>
/> setUploadState({ type: "none" })
</Action> : undefined } }
onChange={(files) =>
setUploadState({ type: "attached", files })
}
cancel={() =>
uploadState.type === "uploading" &&
uploadState.cancel.cancel("cancel")
}
append={(files) => {
if (files.length === 0) return;
if (uploadState.type === "none") {
setUploadState({ type: "attached", files });
} else if (uploadState.type === "attached") {
setUploadState({
type: "attached",
files: [...uploadState.files, ...files],
});
}
}}
/>
</Action>
) : undefined}
<TextAreaAutoSize <TextAreaAutoSize
autoFocus autoFocus
hideBorder hideBorder
maxRows={5} maxRows={20}
padding={14}
id="message" id="message"
value={draft ?? ''}
onKeyUp={onKeyUp} onKeyUp={onKeyUp}
onKeyDown={e => { value={draft ?? ""}
padding="var(--message-box-padding)"
onKeyDown={(e) => {
if (onKeyDown(e)) return; if (onKeyDown(e)) return;
if ( if (
...@@ -350,39 +468,52 @@ function MessageBox({ channel, draft }: Props) { ...@@ -350,39 +468,52 @@ function MessageBox({ channel, draft }: Props) {
return; return;
} }
if (!e.shiftKey && e.key === "Enter" && !isTouchscreenDevice) { if (
!e.shiftKey &&
e.key === "Enter" &&
!isTouchscreenDevice
) {
e.preventDefault(); e.preventDefault();
return send(); return send();
} }
debouncedStopTyping(true); debouncedStopTyping(true);
}} }}
placeholder={ placeholder={
channel.channel_type === "DirectMessage" ? translate("app.main.channel.message_who", { channel.channel_type === "DirectMessage"
person: client.users.get(client.channels.getRecipient(channel._id))?.username }) ? translate("app.main.channel.message_who", {
: channel.channel_type === "SavedMessages" ? translate("app.main.channel.message_saved") person: channel.recipient?.username,
: translate("app.main.channel.message_where", { channel_name: channel.name }) })
: channel.channel_type === "SavedMessages"
? translate("app.main.channel.message_saved")
: translate("app.main.channel.message_where", {
channel_name: channel.name ?? undefined,
})
}
disabled={
uploadState.type === "uploading" ||
uploadState.type === "sending"
} }
disabled={uploadState.type === 'uploading' || uploadState.type === 'sending'} onChange={(e) => {
onChange={e => {
setMessage(e.currentTarget.value); setMessage(e.currentTarget.value);
startTyping(); startTyping();
onChange(e); onChange(e);
}} }}
onFocus={onFocus} onFocus={onFocus}
onBlur={onBlur} /> onBlur={onBlur}
{ isTouchscreenDevice && <Action> />
<IconButton onClick={send}> <Action>
{/*<IconButton onClick={emojiPicker}>
<HappyAlt size={20} />
</IconButton>*/}
<IconButton
className="mobile"
onClick={send}
onMouseDown={(e) => e.preventDefault()}>
<Send size={20} /> <Send size={20} />
</IconButton> </IconButton>
</Action> } </Action>
</Base> </Base>
</> </>
) );
} });
export default connectState<Omit<Props, "dispatch" | "draft">>(MessageBox, (state, { channel }) => {
return {
draft: state.drafts[channel._id]
}
}, true)
src/components/common/messaging/SystemMessage.tsx
View file @ 1ac5de17
import { User } from "revolt.js"; import { observer } from "mobx-react-lite";
import { Message } from "revolt.js/dist/maps/Messages";
import { User } from "revolt.js/dist/maps/Users";
import styled from "styled-components"; import styled from "styled-components";
import UserShort from "../user/UserShort";
import { TextReact } from "../../../lib/i18n";
import { attachContextMenu } from "preact-context-menu"; import { attachContextMenu } from "preact-context-menu";
import { MessageObject } from "../../../context/revoltjs/util";
import { TextReact } from "../../../lib/i18n";
import { useClient } from "../../../context/revoltjs/RevoltClient";
import UserShort from "../user/UserShort";
import MessageBase, { MessageDetail, MessageInfo } from "./MessageBase"; import MessageBase, { MessageDetail, MessageInfo } from "./MessageBase";
import { useForceUpdate, useUser } from "../../../context/revoltjs/hooks";
const SystemContent = styled.div` const SystemContent = styled.div`
gap: 4px; gap: 4px;
...@@ -30,120 +35,136 @@ type SystemMessageParsed = ...@@ -30,120 +35,136 @@ type SystemMessageParsed =
interface Props { interface Props {
attachContext?: boolean; attachContext?: boolean;
message: MessageObject; message: Message;
highlight?: boolean;
hideInfo?: boolean;
} }
export function SystemMessage({ attachContext, message }: Props) { export const SystemMessage = observer(
const ctx = useForceUpdate(); ({ attachContext, message, highlight, hideInfo }: Props) => {
const client = useClient();
let data: SystemMessageParsed;
const content = message.content;
if (typeof content === "object") {
switch (content.type) {
case "text":
data = content;
break;
case "user_added":
case "user_remove":
data = {
type: content.type,
user: client.users.get(content.id)!,
by: client.users.get(content.by)!,
};
break;
case "user_joined":
case "user_left":
case "user_kicked":
case "user_banned":
data = {
type: content.type,
user: client.users.get(content.id)!,
};
break;
case "channel_renamed":
data = {
type: "channel_renamed",
name: content.name,
by: client.users.get(content.by)!,
};
break;
case "channel_description_changed":
case "channel_icon_changed":
data = {
type: content.type,
by: client.users.get(content.by)!,
};
break;
default:
data = { type: "text", content: JSON.stringify(content) };
}
} else {
data = { type: "text", content };
}
let data: SystemMessageParsed; let children;
let content = message.content; switch (data.type) {
if (typeof content === "object") {
switch (content.type) {
case "text": case "text":
data = content; children = <span>{data.content}</span>;
break; break;
case "user_added": case "user_added":
case "user_remove": case "user_remove":
data = { children = (
type: content.type, <TextReact
user: useUser(content.id, ctx) as User, id={`app.main.channel.system.${
by: useUser(content.by, ctx) as User data.type === "user_added"
}; ? "added_by"
: "removed_by"
}`}
fields={{
user: <UserShort user={data.user} />,
other_user: <UserShort user={data.by} />,
}}
/>
);
break; break;
case "user_joined": case "user_joined":
case "user_left": case "user_left":
case "user_kicked": case "user_kicked":
case "user_banned": case "user_banned":
data = { children = (
type: content.type, <TextReact
user: useUser(content.id, ctx) as User id={`app.main.channel.system.${data.type}`}
}; fields={{
user: <UserShort user={data.user} />,
}}
/>
);
break; break;
case "channel_renamed": case "channel_renamed":
data = { children = (
type: "channel_renamed", <TextReact
name: content.name, id={`app.main.channel.system.channel_renamed`}
by: useUser(content.by, ctx) as User fields={{
}; user: <UserShort user={data.by} />,
name: <b>{data.name}</b>,
}}
/>
);
break; break;
case "channel_description_changed": case "channel_description_changed":
case "channel_icon_changed": case "channel_icon_changed":
data = { children = (
type: content.type, <TextReact
by: useUser(content.by, ctx) as User id={`app.main.channel.system.${data.type}`}
}; fields={{
user: <UserShort user={data.by} />,
}}
/>
);
break; break;
default:
data = { type: "text", content: JSON.stringify(content) };
} }
} else {
data = { type: "text", content };
}
let children;
switch (data.type) {
case "text":
children = <span>{data.content}</span>;
break;
case "user_added":
case "user_remove":
children = (
<TextReact
id={`app.main.channel.system.${data.type === 'user_added' ? "added_by" : "removed_by"}`}
fields={{
user: <UserShort user={data.user} />,
other_user: <UserShort user={data.by} />
}}
/>
);
break;
case "user_joined":
case "user_left":
case "user_kicked":
case "user_banned":
children = (
<TextReact
id={`app.main.channel.system.${data.type}`}
fields={{
user: <UserShort user={data.user} />
}}
/>
);
break;
case "channel_renamed":
children = (
<TextReact
id={`app.main.channel.system.channel_renamed`}
fields={{
user: <UserShort user={data.by} />,
name: <b>{data.name}</b>
}}
/>
);
break;
case "channel_description_changed":
case "channel_icon_changed":
children = (
<TextReact
id={`app.main.channel.system.${data.type}`}
fields={{
user: <UserShort user={data.by} />
}}
/>
);
break;
}
return ( return (
<MessageBase <MessageBase
onContextMenu={attachContext ? attachContextMenu('Menu', highlight={highlight}
{ message, contextualChannel: message.channel } onContextMenu={
) : undefined}> attachContext
<MessageInfo> ? attachContextMenu("Menu", {
<MessageDetail message={message} position="left" /> message,
</MessageInfo> contextualChannel: message.channel,
<SystemContent>{children}</SystemContent> })
</MessageBase> : undefined
); }>
} {!hideInfo && (
<MessageInfo>
<MessageDetail message={message} position="left" />
</MessageInfo>
)}
<SystemContent>{children}</SystemContent>
</MessageBase>
);
},
);
src/components/common/messaging/attachments/Attachment.module.scss
View file @ 1ac5de17
.attachment { .attachment {
display: grid; display: grid;
grid-auto-columns: min(100%, 480px);
grid-auto-flow: row dense; grid-auto-flow: row dense;
grid-auto-columns: min(100%, var(--attachment-max-width));
margin: 0.125rem 0 0.125rem;
width: max-content; width: max-content;
max-width: 100%;
border-radius: 6px;
margin: .125rem 0 .125rem;
&[data-spoiler="true"] { &[data-spoiler="true"] {
filter: blur(30px); filter: blur(30px);
pointer-events: none; pointer-events: none;
} }
&[data-has-content="true"] {
margin-top: 4px;
}
&.image {
cursor: pointer;
max-height: 640px;
max-width: min(480px, 100%);
object-fit: contain;
&.loaded {
width: auto;
height: auto;
}
}
&.video {
.actions {
padding: 10px 12px;
border-radius: 6px 6px 0 0;
}
video {
border-radius: 0 0 6px 6px;
max-height: 640px;
max-width: min(480px, 100%);
}
video.loaded {
width: auto;
height: auto;
}
}
&.audio { &.audio {
gap: 4px; gap: 4px;
padding: 6px; padding: 6px;
display: flex; display: flex;
border-radius: 6px; max-width: 100%;
flex-direction: column; flex-direction: column;
width: var(--attachment-default-width);
background: var(--secondary-background); background: var(--secondary-background);
max-width: 400px;
> audio { > audio {
width: 100%; width: 100%;
...@@ -66,21 +28,20 @@ ...@@ -66,21 +28,20 @@
&.file { &.file {
> div { > div {
width: 400px;
padding: 12px; padding: 12px;
max-width: 100%;
user-select: none; user-select: none;
width: fit-content; width: fit-content;
border-radius: 6px; border-radius: var(--border-radius);
width: var(--attachment-default-width);
} }
} }
&.text { &.text {
width: 100%; width: 100%;
max-width: 800px;
overflow: hidden; overflow: hidden;
grid-auto-columns: unset; grid-auto-columns: unset;
max-width: var(--attachment-max-text-width);
border-radius: 6px;
.textContent { .textContent {
height: 140px; height: 140px;
...@@ -89,18 +50,18 @@ ...@@ -89,18 +50,18 @@
overflow-y: auto; overflow-y: auto;
border-radius: 0 !important; border-radius: 0 !important;
background: var(--secondary-header); background: var(--secondary-header);
pre { pre {
margin: 0; margin: 0;
} }
pre code { pre code {
font-family: var(--monoscape-font), sans-serif; font-family: var(--monospace-font), sans-serif;
} }
&[data-loading="true"] { &[data-loading="true"] {
display: flex; display: flex;
> * { > * {
flex-grow: 1; flex-grow: 1;
} }
...@@ -109,48 +70,22 @@ ...@@ -109,48 +70,22 @@
} }
} }
.actions.imageAction { .margin {
grid-template: margin-top: 4px;
"name icon download" auto
"size icon download" auto
/ minmax(20px, 1fr) min-content min-content;
} }
.actions { .container {
display: grid; max-width: 100%;
grid-template: overflow: hidden;
"icon name download" auto width: fit-content;
"icon size download" auto
/ min-content minmax(20px, 1fr) min-content;
align-items: center;
column-gap: 8px;
width: 100%;
padding: 8px;
overflow: none;
color: var(--foreground);
background: var(--secondary-background);
span { > :first-child {
text-overflow: ellipsis; width: min(var(--attachment-max-width), 100%, var(--width));
white-space: nowrap;
overflow: hidden;
}
.filesize {
grid-area: size;
font-size: 10px;
color: var(--secondary-foreground);
}
.downloadIcon {
grid-area: download;
} }
}
.iconType { .container,
grid-area: icon; .attachment,
} .image {
border-radius: var(--border-radius);
} }
src/components/common/messaging/attachments/Attachment.tsx
View file @ 1ac5de17
import TextFile from "./TextFile"; import { Attachment as AttachmentI } from "revolt-api/types/Autumn";
import { Text } from "preact-i18n";
import classNames from "classnames";
import styles from "./Attachment.module.scss"; import styles from "./Attachment.module.scss";
import AttachmentActions from "./AttachmentActions"; import classNames from "classnames";
import { useContext, useState } from "preact/hooks"; import { useContext, useState } from "preact/hooks";
import { AppContext } from "../../../../context/revoltjs/RevoltClient";
import { Attachment as AttachmentRJS } from "revolt.js/dist/api/objects";
import { useIntermediate } from "../../../../context/intermediate/Intermediate"; import { useIntermediate } from "../../../../context/intermediate/Intermediate";
import { MessageAreaWidthContext } from "../../../../pages/channels/messaging/MessageArea"; import { AppContext } from "../../../../context/revoltjs/RevoltClient";
import AttachmentActions from "./AttachmentActions";
import { SizedGrid } from "./Grid";
import Spoiler from "./Spoiler";
import TextFile from "./TextFile";
interface Props { interface Props {
attachment: AttachmentRJS; attachment: AttachmentI;
hasContent: boolean; hasContent: boolean;
} }
...@@ -20,104 +23,97 @@ export default function Attachment({ attachment, hasContent }: Props) { ...@@ -20,104 +23,97 @@ export default function Attachment({ attachment, hasContent }: Props) {
const client = useContext(AppContext); const client = useContext(AppContext);
const { openScreen } = useIntermediate(); const { openScreen } = useIntermediate();
const { filename, metadata } = attachment; const { filename, metadata } = attachment;
const [ spoiler, setSpoiler ] = useState(filename.startsWith("SPOILER_")); const [spoiler, setSpoiler] = useState(filename.startsWith("SPOILER_"));
const [ loaded, setLoaded ] = useState(false)
const url = client.generateFileURL(attachment, { width: MAX_ATTACHMENT_WIDTH * 1.5 }, true);
const url = client.generateFileURL(
attachment,
{ width: MAX_ATTACHMENT_WIDTH * 1.5 },
true,
);
switch (metadata.type) { switch (metadata.type) {
case "Image": { case "Image": {
return ( return (
<div <SizedGrid
className={styles.container} width={metadata.width}
onClick={() => spoiler && setSpoiler(false)} height={metadata.height}
> className={classNames({
{spoiler && ( [styles.margin]: hasContent,
<div className={styles.overflow}> spoiler,
<span><Text id="app.main.channel.misc.spoiler_attachment" /></span> })}>
</div>
)}
<img <img
src={url} src={url}
alt={filename} alt={filename}
width={metadata.width} className={styles.image}
height={metadata.height} loading="lazy"
data-spoiler={spoiler}
data-has-content={hasContent}
className={classNames(styles.attachment, styles.image, loaded && styles.loaded)}
onClick={() => onClick={() =>
openScreen({ id: "image_viewer", attachment }) openScreen({ id: "image_viewer", attachment })
} }
onMouseDown={ev => onMouseDown={(ev) =>
ev.button === 1 && ev.button === 1 && window.open(url, "_blank")
window.open(url, "_blank")
} }
onLoad={() => setLoaded(true)}
/> />
</div> {spoiler && <Spoiler set={setSpoiler} />}
); </SizedGrid>
}
case "Audio": {
return (
<div
className={classNames(styles.attachment, styles.audio)}
data-has-content={hasContent}
>
<AttachmentActions attachment={attachment} />
<audio src={url} controls />
</div>
); );
} }
case "Video": { case "Video": {
return ( return (
<div <div
className={styles.container} className={classNames(styles.container, {
onClick={() => spoiler && setSpoiler(false)}> [styles.margin]: hasContent,
{spoiler && ( })}
<div className={styles.overflow}> style={{ "--width": `${metadata.width}px` }}>
<span><Text id="app.main.channel.misc.spoiler_attachment" /></span> <AttachmentActions attachment={attachment} />
</div> <SizedGrid
)} width={metadata.width}
<div height={metadata.height}
data-spoiler={spoiler} className={classNames({ spoiler })}>
data-has-content={hasContent}
className={classNames(styles.attachment, styles.video)}
>
<AttachmentActions attachment={attachment} />
<video <video
src={url} src={url}
alt={filename}
controls
loading="lazy"
width={metadata.width} width={metadata.width}
height={metadata.height} height={metadata.height}
className={classNames(loaded && styles.loaded)} onMouseDown={(ev) =>
controls ev.button === 1 && window.open(url, "_blank")
onMouseDown={ev =>
ev.button === 1 &&
window.open(url, "_blank")
} }
onLoadedMetadata={() => setLoaded(true)}
/> />
</div> {spoiler && <Spoiler set={setSpoiler} />}
</SizedGrid>
</div> </div>
); );
} }
case 'Text': {
case "Audio": {
return (
<div
className={classNames(styles.attachment, styles.audio)}
data-has-content={hasContent}>
<AttachmentActions attachment={attachment} />
<audio src={url} controls />
</div>
);
}
case "Text": {
return ( return (
<div <div
className={classNames(styles.attachment, styles.text)} className={classNames(styles.attachment, styles.text)}
data-has-content={hasContent} data-has-content={hasContent}>
>
<TextFile attachment={attachment} /> <TextFile attachment={attachment} />
<AttachmentActions attachment={attachment} /> <AttachmentActions attachment={attachment} />
</div> </div>
); );
} }
default: { default: {
return ( return (
<div <div
className={classNames(styles.attachment, styles.file)} className={classNames(styles.attachment, styles.file)}
data-has-content={hasContent} data-has-content={hasContent}>
>
<AttachmentActions attachment={attachment} /> <AttachmentActions attachment={attachment} />
</div> </div>
); );
......
src/components/common/messaging/attachments/AttachmentActions.module.scss 0 → 100644
View file @ 1ac5de17
.actions.imageAction {
grid-template:
"name icon external download" auto
"size icon external download" auto
/ minmax(20px, 1fr) min-content min-content;
}
.actions {
display: grid;
grid-template:
"icon name external download" auto
"icon size external download" auto
/ min-content minmax(20px, 1fr) min-content;
align-items: center;
column-gap: 12px;
width: 100%;
padding: 8px;
overflow: none;
color: var(--foreground);
background: var(--secondary-background);
span {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.filesize {
grid-area: size;
font-size: 10px;
color: var(--secondary-foreground);
}
.downloadIcon {
grid-area: download;
}
.externalType {
grid-area: external;
}
.iconType {
grid-area: icon;
}
}
src/components/common/messaging/attachments/AttachmentActions.tsx
View file @ 1ac5de17
import { useContext } from 'preact/hooks'; import {
import styles from './Attachment.module.scss'; Download,
import IconButton from '../../../ui/IconButton'; LinkExternal,
import { Attachment } from "revolt.js/dist/api/objects"; File,
import { determineFileSize } from '../../../../lib/fileSize'; Headphone,
import { AppContext } from '../../../../context/revoltjs/RevoltClient'; Video,
import { Download, LinkExternal, File, Headphone, Video } from '@styled-icons/boxicons-regular'; } from "@styled-icons/boxicons-regular";
import classNames from 'classnames'; import { Attachment } from "revolt-api/types/Autumn";
import styles from "./AttachmentActions.module.scss";
import classNames from "classnames";
import { useContext } from "preact/hooks";
import { determineFileSize } from "../../../../lib/fileSize";
import { AppContext } from "../../../../context/revoltjs/RevoltClient";
import IconButton from "../../../ui/IconButton";
interface Props { interface Props {
attachment: Attachment; attachment: Attachment;
...@@ -17,66 +27,105 @@ export default function AttachmentActions({ attachment }: Props) { ...@@ -17,66 +27,105 @@ export default function AttachmentActions({ attachment }: Props) {
const url = client.generateFileURL(attachment)!; const url = client.generateFileURL(attachment)!;
const open_url = `${url}/${filename}`; const open_url = `${url}/${filename}`;
const download_url = url.replace('attachments', 'attachments/download') const download_url = url.replace("attachments", "attachments/download");
const filesize = determineFileSize(size as any); const filesize = determineFileSize(size);
switch (metadata.type) { switch (metadata.type) {
case 'Image': case "Image":
return ( return (
<div className={classNames(styles.actions, styles.imageAction)}> <div className={classNames(styles.actions, styles.imageAction)}>
<span className={styles.filename}>{filename}</span> <span className={styles.filename}>{filename}</span>
<span className={styles.filesize}>{metadata.width + 'x' + metadata.height} ({filesize})</span> <span className={styles.filesize}>
<a href={open_url} target="_blank" className={styles.iconType} > {`${metadata.width}x${metadata.height}`} ({filesize})
</span>
<a
href={open_url}
target="_blank"
className={styles.iconType}
rel="noreferrer">
<IconButton> <IconButton>
<LinkExternal size={24} /> <LinkExternal size={24} />
</IconButton> </IconButton>
</a> </a>
<a href={download_url} className={styles.downloadIcon} download target="_blank"> <a
href={download_url}
className={styles.downloadIcon}
download
target="_blank"
rel="noreferrer">
<IconButton> <IconButton>
<Download size={24} /> <Download size={24} />
</IconButton> </IconButton>
</a> </a>
</div> </div>
) );
case 'Audio': case "Audio":
return ( return (
<div className={classNames(styles.actions, styles.audioAction)}> <div className={classNames(styles.actions, styles.audioAction)}>
<Headphone size={24} className={styles.iconType} /> <Headphone size={24} className={styles.iconType} />
<span className={styles.filename}>{filename}</span> <span className={styles.filename}>{filename}</span>
<span className={styles.filesize}>{filesize}</span> <span className={styles.filesize}>{filesize}</span>
<a href={download_url} className={styles.downloadIcon} download target="_blank"> <a
href={download_url}
className={styles.downloadIcon}
download
target="_blank"
rel="noreferrer">
<IconButton> <IconButton>
<Download size={24} /> <Download size={24} />
</IconButton> </IconButton>
</a> </a>
</div> </div>
) );
case 'Video': case "Video":
return ( return (
<div className={classNames(styles.actions, styles.videoAction)}> <div className={classNames(styles.actions, styles.videoAction)}>
<Video size={24} className={styles.iconType} /> <Video size={24} className={styles.iconType} />
<span className={styles.filename}>{filename}</span> <span className={styles.filename}>{filename}</span>
<span className={styles.filesize}>{metadata.width + 'x' + metadata.height} ({filesize})</span> <span className={styles.filesize}>
<a href={download_url} className={styles.downloadIcon} download target="_blank"> {`${metadata.width}x${metadata.height}`} ({filesize})
</span>
<a
href={download_url}
className={styles.downloadIcon}
download
target="_blank"
rel="noreferrer">
<IconButton> <IconButton>
<Download size={24} /> <Download size={24} />
</IconButton> </IconButton>
</a> </a>
</div> </div>
) );
default: default:
return ( return (
<div className={styles.actions}> <div className={styles.actions}>
<File size={24} className={styles.iconType} /> <File size={24} className={styles.iconType} />
<span className={styles.filename}>{filename}</span> <span className={styles.filename}>{filename}</span>
<span className={styles.filesize}>{filesize}</span> <span className={styles.filesize}>{filesize}</span>
<a href={download_url} className={styles.downloadIcon} download target="_blank"> {metadata.type === "Text" && (
<a
href={open_url}
target="_blank"
className={styles.externalType}
rel="noreferrer">
<IconButton>
<LinkExternal size={24} />
</IconButton>
</a>
)}
<a
href={download_url}
className={styles.downloadIcon}
download
target="_blank"
rel="noreferrer">
<IconButton> <IconButton>
<Download size={24} /> <Download size={24} />
</IconButton> </IconButton>
</a> </a>
</div> </div>
) );
} }
} }
src/components/common/messaging/attachments/Grid.tsx 0 → 100644
View file @ 1ac5de17
import styled from "styled-components";
import { Children } from "../../../../types/Preact";
const Grid = styled.div`
display: grid;
overflow: hidden;
max-width: min(var(--attachment-max-width), 100%, var(--width));
max-height: min(var(--attachment-max-height), var(--height));
aspect-ratio: var(--aspect-ratio);
img,
video {
min-width: 100%;
min-height: 100%;
width: auto;
height: auto;
max-width: 100%;
max-height: 100%;
grid-area: 1 / 1;
}
&.spoiler {
img,
video {
filter: blur(44px);
}
border-radius: var(--border-radius);
}
`;
export default Grid;
type Props = Omit<
JSX.HTMLAttributes<HTMLDivElement>,
"children" | "as" | "style"
> & {
style?: JSX.CSSProperties;
children?: Children;
width: number;
height: number;
};
export function SizedGrid(props: Props) {
const { width, height, children, style, ...divProps } = props;
return (
<Grid
{...divProps}
style={{
...style,
"--width": `${width}px`,
"--height": `${height}px`,
"--aspect-ratio": width / height,
}}>
{children}
</Grid>
);
}
src/components/common/messaging/attachments/MessageReply.tsx
View file @ 1ac5de17
import { Text } from "preact-i18n"; import { File } from "@styled-icons/boxicons-solid";
import UserShort from "../../user/UserShort"; import { observer } from "mobx-react-lite";
import { useHistory } from "react-router-dom";
import { RelationshipStatus } from "revolt-api/types/Users";
import { SYSTEM_USER_ID } from "revolt.js";
import { Channel } from "revolt.js/dist/maps/Channels";
import { Message } from "revolt.js/dist/maps/Messages";
import styled, { css } from "styled-components"; import styled, { css } from "styled-components";
import Markdown from "../../../markdown/Markdown";
import { Reply, File } from "@styled-icons/boxicons-regular"; import { Text } from "preact-i18n";
import { useUser } from "../../../../context/revoltjs/hooks"; import { useLayoutEffect, useState } from "preact/hooks";
import { useRenderState } from "../../../../lib/renderer/Singleton"; import { useRenderState } from "../../../../lib/renderer/Singleton";
import Markdown from "../../../markdown/Markdown";
import UserShort from "../../user/UserShort";
import { SystemMessage } from "../SystemMessage";
interface Props { interface Props {
channel: string channel: Channel;
index: number index: number;
id: string id: string;
} }
export const ReplyBase = styled.div<{ head?: boolean, fail?: boolean, preview?: boolean }>` export const ReplyBase = styled.div<{
head?: boolean;
fail?: boolean;
preview?: boolean;
}>`
gap: 4px; gap: 4px;
min-width: 0;
display: flex; display: flex;
margin-inline-start: 30px;
margin-inline-end: 12px;
/*margin-bottom: 4px;*/
font-size: 0.8em; font-size: 0.8em;
margin-left: 30px;
user-select: none; user-select: none;
margin-bottom: 4px;
align-items: center; align-items: center;
color: var(--secondary-foreground); color: var(--secondary-foreground);
overflow: hidden; &::before {
white-space: nowrap; content: "";
text-overflow: ellipsis; height: 10px;
width: 28px;
margin-inline-end: 2px;
align-self: flex-end;
display: flex;
border-top: 2.2px solid var(--tertiary-foreground);
border-inline-start: 2.2px solid var(--tertiary-foreground);
border-start-start-radius: 6px;
}
* {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.user {
gap: 6px;
display: flex;
flex-shrink: 0;
font-weight: 600;
overflow: visible;
align-items: center;
padding: 2px 0;
span {
cursor: pointer;
&:hover {
text-decoration: underline;
}
}
/*&::before {
position:relative;
width: 50px;
height: 2px;
background: red;
}*/
}
.content {
padding: 2px 0;
gap: 4px;
display: flex;
cursor: pointer;
align-items: center;
flex-direction: row;
transition: filter 1s ease-in-out;
transition: transform ease-in-out 0.1s;
filter: brightness(1);
&:hover {
filter: brightness(2);
}
&:active {
transform: translateY(1px);
}
> * {
pointer-events: none;
}
svg:first-child { /*> span > p {
display: flex;
}*/
}
> svg:first-child {
flex-shrink: 0; flex-shrink: 0;
transform: scaleX(-1); transform: scaleX(-1);
color: var(--tertiary-foreground); color: var(--tertiary-foreground);
} }
${ props => props.fail && css` ${(props) =>
color: var(--tertiary-foreground); props.fail &&
` } css`
color: var(--tertiary-foreground);
`}
${ props => props.head && css` ${(props) =>
margin-top: 12px; props.head &&
` } css`
margin-top: 12px;
`}
${ props => props.preview && css` ${(props) =>
margin-left: 0; props.preview &&
` } css`
margin-left: 0;
`}
`; `;
export function MessageReply({ index, channel, id }: Props) { export const MessageReply = observer(({ index, channel, id }: Props) => {
const view = useRenderState(channel); const view = useRenderState(channel._id);
if (view?.type !== 'RENDER') return null; if (view?.type !== "RENDER") return null;
const [message, setMessage] = useState<Message | undefined>(undefined);
useLayoutEffect(() => {
// ! FIXME: We should do this through the message renderer, so it can fetch it from cache if applicable.
const m = view.messages.find((x) => x._id === id);
if (m) {
setMessage(m);
} else {
channel.fetchMessage(id).then(setMessage);
}
}, [id, channel, view.messages]);
const message = view.messages.find(x => x._id === id);
if (!message) { if (!message) {
return ( return (
<ReplyBase head={index === 0} fail> <ReplyBase head={index === 0} fail>
<Reply size={16} /> <span>
<span><Text id="app.main.channel.misc.failed_load" /></span> <Text id="app.main.channel.misc.failed_load" />
</span>
</ReplyBase> </ReplyBase>
) );
} }
const user = useUser(message.author); const history = useHistory();
return ( return (
<ReplyBase head={index === 0}> <ReplyBase head={index === 0}>
<Reply size={16} /> {message.author?.relationship === RelationshipStatus.Blocked ? (
<UserShort user={user} size={16} /> <Text id="app.main.channel.misc.blocked_user" />
{ message.attachments && message.attachments.length > 0 && <File size={16} /> } ) : (
<Markdown disallowBigEmoji content={(message.content as string).replace(/\n/g, ' ')} /> <>
{message.author_id === SYSTEM_USER_ID ? (
<SystemMessage message={message} hideInfo />
) : (
<>
<div className="user">
<UserShort user={message.author} size={16} />
</div>
<div
className="content"
onClick={() => {
const channel = message.channel!;
if (
channel.channel_type === "TextChannel"
) {
console.log(
`/server/${channel.server_id}/channel/${channel._id}/${message._id}`,
);
history.push(
`/server/${channel.server_id}/channel/${channel._id}/${message._id}`,
);
} else {
history.push(
`/channel/${channel._id}/${message._id}`,
);
}
}}>
{message.attachments && (
<>
<File size={16} />
<em>
{message.attachments.length > 1 ? (
<Text id="app.main.channel.misc.sent_multiple_files" />
) : (
<Text id="app.main.channel.misc.sent_file" />
)}
</em>
</>
)}
<Markdown
disallowBigEmoji
content={(
message.content as string
).replace(/\n/g, " ")}
/>
</div>
</>
)}
</>
)}
</ReplyBase> </ReplyBase>
) );
} });
src/components/common/messaging/attachments/Spoiler.tsx 0 → 100644
View file @ 1ac5de17
import styled from "styled-components";
import { Text } from "preact-i18n";
const Base = styled.div`
display: grid;
place-items: center;
z-index: 1;
grid-area: 1 / 1;
cursor: pointer;
user-select: none;
text-transform: uppercase;
span {
padding: 8px;
color: var(--foreground);
background: var(--primary-background);
border-radius: calc(var(--border-radius) * 4);
}
`;
interface Props {
set: (v: boolean) => void;
}
export default function Spoiler({ set }: Props) {
return (
<Base onClick={() => set(false)}>
<span>
<Text id="app.main.channel.misc.spoiler_attachment" />
</span>
</Base>
);
}
src/components/common/messaging/attachments/TextFile.tsx
View file @ 1ac5de17
import axios from 'axios'; import axios from "axios";
import Preloader from '../../../ui/Preloader'; import { Attachment } from "revolt-api/types/Autumn";
import styles from './Attachment.module.scss';
import { Attachment } from 'revolt.js/dist/api/objects'; import styles from "./Attachment.module.scss";
import { useContext, useEffect, useState } from 'preact/hooks'; import { useContext, useEffect, useState } from "preact/hooks";
import RequiresOnline from '../../../../context/revoltjs/RequiresOnline';
import { AppContext, StatusContext } from '../../../../context/revoltjs/RevoltClient'; import RequiresOnline from "../../../../context/revoltjs/RequiresOnline";
import {
AppContext,
StatusContext,
} from "../../../../context/revoltjs/RevoltClient";
import Preloader from "../../../ui/Preloader";
interface Props { interface Props {
attachment: Attachment; attachment: Attachment;
...@@ -13,45 +19,62 @@ interface Props { ...@@ -13,45 +19,62 @@ interface Props {
const fileCache: { [key: string]: string } = {}; const fileCache: { [key: string]: string } = {};
export default function TextFile({ attachment }: Props) { export default function TextFile({ attachment }: Props) {
const [ content, setContent ] = useState<undefined | string>(undefined); const [content, setContent] = useState<undefined | string>(undefined);
const [ loading, setLoading ] = useState(false); const [loading, setLoading] = useState(false);
const status = useContext(StatusContext); const status = useContext(StatusContext);
const client = useContext(AppContext); const client = useContext(AppContext);
const url = client.generateFileURL(attachment)!; const url = client.generateFileURL(attachment)!;
useEffect(() => { useEffect(() => {
if (typeof content !== 'undefined') return; if (typeof content !== "undefined") return;
if (loading) return; if (loading) return;
if (attachment.size > 20_000) {
setContent(
"This file is > 20 KB, for your sake I did not load it.\nSee tracking issue here for previews: https://gitlab.insrt.uk/revolt/revite/-/issues/2",
);
return;
}
setLoading(true); setLoading(true);
let cached = fileCache[attachment._id]; const cached = fileCache[attachment._id];
if (cached) { if (cached) {
setContent(cached); setContent(cached);
setLoading(false); setLoading(false);
} else { } else {
axios.get(url) axios
.then(res => { .get(url, { transformResponse: [] })
.then((res) => {
setContent(res.data); setContent(res.data);
fileCache[attachment._id] = res.data; fileCache[attachment._id] = res.data;
setLoading(false); setLoading(false);
}) })
.catch(() => { .catch(() => {
console.error("Failed to load text file. [", attachment._id, "]"); console.error(
setLoading(false) "Failed to load text file. [",
}) attachment._id,
"]",
);
setLoading(false);
});
} }
}, [ content, loading, status ]); }, [content, loading, status, attachment._id, attachment.size, url]);
return ( return (
<div className={styles.textContent} data-loading={typeof content === 'undefined'}> <div
{ className={styles.textContent}
content ? data-loading={typeof content === "undefined"}>
<pre><code>{ content }</code></pre> {content ? (
: <RequiresOnline> <pre>
<Preloader type="ring" /> <code>{content}</code>
</RequiresOnline> </pre>
} ) : (
<RequiresOnline>
<Preloader type="ring" />
</RequiresOnline>
)}
</div> </div>
) );
} }
src/components/common/messaging/bars/FilePreview.tsx
View file @ 1ac5de17
import { Text } from "preact-i18n"; /* eslint-disable react-hooks/rules-of-hooks */
import { XCircle, Plus, Share, X, File } from "@styled-icons/boxicons-regular";
import styled from "styled-components"; import styled from "styled-components";
import { Text } from "preact-i18n";
import { useEffect, useState } from "preact/hooks";
import { determineFileSize } from "../../../../lib/fileSize";
import { CAN_UPLOAD_AT_ONCE, UploadState } from "../MessageBox"; import { CAN_UPLOAD_AT_ONCE, UploadState } from "../MessageBox";
import { useEffect, useState } from 'preact/hooks';
import { determineFileSize } from '../../../../lib/fileSize';
import { XCircle, Plus, Share, X, File } from "@styled-icons/boxicons-regular";
interface Props { interface Props {
state: UploadState, state: UploadState;
addFile: () => void, addFile: () => void;
removeFile: (index: number) => void removeFile: (index: number) => void;
} }
const Container = styled.div` const Container = styled.div`
...@@ -37,7 +41,7 @@ const Entry = styled.div` ...@@ -37,7 +41,7 @@ const Entry = styled.div`
span.fn { span.fn {
margin: auto; margin: auto;
font-size: .8em; font-size: 0.8em;
overflow: hidden; overflow: hidden;
max-width: 180px; max-width: 180px;
text-align: center; text-align: center;
...@@ -47,7 +51,7 @@ const Entry = styled.div` ...@@ -47,7 +51,7 @@ const Entry = styled.div`
} }
span.size { span.size {
font-size: .6em; font-size: 0.6em;
color: var(--tertiary-foreground); color: var(--tertiary-foreground);
text-align: center; text-align: center;
} }
...@@ -65,7 +69,7 @@ const Divider = styled.div` ...@@ -65,7 +69,7 @@ const Divider = styled.div`
width: 4px; width: 4px;
height: 130px; height: 130px;
flex-shrink: 0; flex-shrink: 0;
border-radius: 4px; border-radius: var(--border-radius);
background: var(--tertiary-background); background: var(--tertiary-background);
`; `;
...@@ -75,8 +79,8 @@ const EmptyEntry = styled.div` ...@@ -75,8 +79,8 @@ const EmptyEntry = styled.div`
display: grid; display: grid;
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
border-radius: 4px;
place-items: center; place-items: center;
border-radius: var(--border-radius);
background: var(--primary-background); background: var(--primary-background);
transition: 0.1s ease background-color; transition: 0.1s ease background-color;
...@@ -89,19 +93,19 @@ const PreviewBox = styled.div` ...@@ -89,19 +93,19 @@ const PreviewBox = styled.div`
display: grid; display: grid;
grid-template: "main" 100px / minmax(100px, 1fr); grid-template: "main" 100px / minmax(100px, 1fr);
justify-items: center; justify-items: center;
background: var(--primary-background);
overflow: hidden;
cursor: pointer; cursor: pointer;
border-radius: 4px; overflow: hidden;
border-radius: var(--border-radius);
.icon, .overlay { grid-area: main } background: var(--primary-background);
.icon,
.overlay {
grid-area: main;
}
.icon { .icon {
height: 100px; height: 100px;
width: 100%;
margin-bottom: 4px; margin-bottom: 4px;
object-fit: contain; object-fit: contain;
} }
...@@ -113,7 +117,7 @@ const PreviewBox = styled.div` ...@@ -113,7 +117,7 @@ const PreviewBox = styled.div`
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0; opacity: 0;
visibility: hidden; visibility: hidden;
...@@ -127,68 +131,103 @@ const PreviewBox = styled.div` ...@@ -127,68 +131,103 @@ const PreviewBox = styled.div`
background-color: rgba(0, 0, 0, 0.8); background-color: rgba(0, 0, 0, 0.8);
} }
} }
` `;
function FileEntry({ file, remove, index }: { file: File, remove?: () => void, index: number }) {
if (!file.type.startsWith('image/')) return (
<Entry className={index >= CAN_UPLOAD_AT_ONCE ? 'fade' : ''}>
<PreviewBox onClick={remove}>
<EmptyEntry className="icon">
<File size={36} />
</EmptyEntry>
<div class="overlay"><XCircle size={36} /></div>
</PreviewBox>
<span class="fn">{file.name}</span>
<span class="size">{determineFileSize(file.size)}</span>
</Entry>
);
const [ url, setURL ] = useState(''); function FileEntry({
file,
remove,
index,
}: {
file: File;
remove?: () => void;
index: number;
}) {
if (!file.type.startsWith("image/"))
return (
<Entry className={index >= CAN_UPLOAD_AT_ONCE ? "fade" : ""}>
<PreviewBox onClick={remove}>
<EmptyEntry className="icon">
<File size={36} />
</EmptyEntry>
<div class="overlay">
<XCircle size={36} />
</div>
</PreviewBox>
<span class="fn">{file.name}</span>
<span class="size">{determineFileSize(file.size)}</span>
</Entry>
);
const [url, setURL] = useState("");
useEffect(() => { useEffect(() => {
let url: string = URL.createObjectURL(file); const url: string = URL.createObjectURL(file);
setURL(url); setURL(url);
return () => URL.revokeObjectURL(url); return () => URL.revokeObjectURL(url);
}, [ file ]); }, [file]);
return ( return (
<Entry className={index >= CAN_UPLOAD_AT_ONCE ? 'fade' : ''}> <Entry className={index >= CAN_UPLOAD_AT_ONCE ? "fade" : ""}>
<PreviewBox onClick={remove}> <PreviewBox onClick={remove}>
<img class="icon" src={url} alt={file.name} /> <img class="icon" src={url} alt={file.name} loading="eager" />
<div class="overlay"><XCircle size={36} /></div> <div class="overlay">
<XCircle size={36} />
</div>
</PreviewBox> </PreviewBox>
<span class="fn">{file.name}</span> <span class="fn">{file.name}</span>
<span class="size">{determineFileSize(file.size)}</span> <span class="size">{determineFileSize(file.size)}</span>
</Entry> </Entry>
) );
} }
export default function FilePreview({ state, addFile, removeFile }: Props) { export default function FilePreview({ state, addFile, removeFile }: Props) {
if (state.type === 'none') return null; if (state.type === "none") return null;
return ( return (
<Container> <Container>
<Carousel> <Carousel>
{ state.files.map((file, index) => {state.files.map((file, index) => (
<> // @ts-expect-error brokey
{ index === CAN_UPLOAD_AT_ONCE && <Divider /> } // eslint-disable-next-line react/jsx-no-undef
<FileEntry index={index} file={file} key={file.name} remove={state.type === 'attached' ? () => removeFile(index) : undefined} /> <Fragment key={file.name}>
</> {index === CAN_UPLOAD_AT_ONCE && <Divider />}
) } <FileEntry
{ state.type === 'attached' && <EmptyEntry onClick={addFile}><Plus size={48} /></EmptyEntry> } index={index}
file={file}
key={file.name}
remove={
state.type === "attached"
? () => removeFile(index)
: undefined
}
/>
</Fragment>
))}
{state.type === "attached" && (
<EmptyEntry onClick={addFile}>
<Plus size={48} />
</EmptyEntry>
)}
</Carousel> </Carousel>
{ state.type === 'uploading' && <Description> {state.type === "uploading" && (
<Share size={24} /> <Description>
<Text id="app.main.channel.uploading_file" /> ({state.percent}%) <Share size={24} />
</Description> } <Text id="app.main.channel.uploading_file" /> (
{ state.type === 'sending' && <Description> {state.percent}%)
<Share size={24} /> </Description>
Sending... )}
</Description> } {state.type === "sending" && (
{ state.type === 'failed' && <Description> <Description>
<X size={24} /> <Share size={24} />
<Text id={`error.${state.error}`} /> Sending...
</Description> } </Description>
)}
{state.type === "failed" && (
<Description>
<X size={24} />
<Text id={`error.${state.error}`} />
</Description>
)}
</Container> </Container>
); );
} }
src/components/common/messaging/bars/JumpToBottom.tsx
View file @ 1ac5de17
import { Text } from "preact-i18n"; import { DownArrowAlt } from "@styled-icons/boxicons-regular";
import styled from "styled-components"; import styled from "styled-components";
import { DownArrow } from "@styled-icons/boxicons-regular";
import { SingletonMessageRenderer, useRenderState } from "../../../../lib/renderer/Singleton"; import { Text } from "preact-i18n";
import {
SingletonMessageRenderer,
useRenderState,
} from "../../../../lib/renderer/Singleton";
const Bar = styled.div` const Bar = styled.div`
z-index: 10; z-index: 10;
...@@ -9,18 +14,20 @@ const Bar = styled.div` ...@@ -9,18 +14,20 @@ const Bar = styled.div`
> div { > div {
top: -26px; top: -26px;
height: 28px;
width: 100%; width: 100%;
position: absolute; position: absolute;
border-radius: 4px 4px 0 0;
display: flex; display: flex;
align-items: center;
cursor: pointer; cursor: pointer;
font-size: 13px; font-size: 13px;
padding: 4px 8px; padding: 0 8px;
user-select: none; user-select: none;
justify-content: space-between;
color: var(--secondary-foreground); color: var(--secondary-foreground);
transition: color ease-in-out 0.08s;
background: var(--secondary-background); background: var(--secondary-background);
justify-content: space-between; border-radius: var(--border-radius) var(--border-radius) 0 0;
transition: color ease-in-out .08s;
> div { > div {
display: flex; display: flex;
...@@ -35,19 +42,31 @@ const Bar = styled.div` ...@@ -35,19 +42,31 @@ const Bar = styled.div`
&:active { &:active {
transform: translateY(1px); transform: translateY(1px);
} }
@media (pointer: coarse) {
height: 34px;
top: -32px;
padding: 0 12px;
}
} }
`; `;
export default function JumpToBottom({ id }: { id: string }) { export default function JumpToBottom({ id }: { id: string }) {
const view = useRenderState(id); const view = useRenderState(id);
if (!view || view.type !== 'RENDER' || view.atBottom) return null; if (!view || view.type !== "RENDER" || view.atBottom) return null;
return ( return (
<Bar> <Bar>
<div onClick={() => SingletonMessageRenderer.jumpToBottom(id, true)}> <div
<div><Text id="app.main.channel.misc.viewing_old" /></div> onClick={() => SingletonMessageRenderer.jumpToBottom(id, true)}>
<div><Text id="app.main.channel.misc.jump_present" /> <DownArrow size={18}/></div> <div>
<Text id="app.main.channel.misc.viewing_old" />
</div>
<div>
<Text id="app.main.channel.misc.jump_present" />{" "}
<DownArrowAlt size={20} />
</div>
</div> </div>
</Bar> </Bar>
) );
} }