Merge pull request #223 from brecert/identity-fix

Improve server identity avatar preview
This commit is contained in:
Paul Makles 2021-09-11 23:53:17 +01:00 committed by GitHub
commit 60c3a5ba11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 34 deletions

View file

@ -12,6 +12,7 @@ import Overline from "../../../components/ui/Overline";
import { FileUploader } from "../../revoltjs/FileUploads"; import { FileUploader } from "../../revoltjs/FileUploads";
import { useClient } from "../../revoltjs/RevoltClient"; import { useClient } from "../../revoltjs/RevoltClient";
import styled, { css } from "styled-components";
interface Props { interface Props {
server: Server; server: Server;
@ -58,16 +59,15 @@ export const ServerIdentityModal = observer(({ server, onClose }: Props) => {
maxFileSize={4_000_000} maxFileSize={4_000_000}
onUpload={(avatar) => member.edit({ avatar })} onUpload={(avatar) => member.edit({ avatar })}
remove={() => member.edit({ remove: "Avatar" })} remove={() => member.edit({ remove: "Avatar" })}
defaultPreview={client.generateFileURL( defaultPreview={client.user?.generateAvatarURL({
member.avatar ?? undefined, max_side: 256,
{ max_side: 256 }, }, false)}
true,
)}
previewURL={client.generateFileURL( previewURL={client.generateFileURL(
member.avatar ?? undefined, member.avatar ?? undefined,
{ max_side: 256 }, { max_side: 256 },
true, true,
)} )}
desaturateDefault
/> />
</div> </div>
<div> <div>

View file

@ -42,6 +42,10 @@
filter: brightness(0.8); filter: brightness(0.8);
} }
&.desaturate {
filter: brightness(0.7) sepia(50%) grayscale(90%);
}
.edit { .edit {
opacity: 0; opacity: 0;
width: 100%; width: 100%;

View file

@ -16,11 +16,7 @@ import { useIntermediate } from "../intermediate/Intermediate";
import { AppContext } from "./RevoltClient"; import { AppContext } from "./RevoltClient";
import { takeError } from "./util"; import { takeError } from "./util";
type Props = { type BehaviourType =
maxFileSize: number;
remove: () => Promise<void>;
fileType: "backgrounds" | "icons" | "avatars" | "attachments" | "banners";
} & (
| { behaviour: "ask"; onChange: (file: File) => void } | { behaviour: "ask"; onChange: (file: File) => void }
| { behaviour: "upload"; onUpload: (id: string) => Promise<void> } | { behaviour: "upload"; onUpload: (id: string) => Promise<void> }
| { | {
@ -28,14 +24,15 @@ type Props = {
onChange: (files: File[]) => void; onChange: (files: File[]) => void;
append?: (files: File[]) => void; append?: (files: File[]) => void;
} }
) &
( type StyleType =
| { | {
style: "icon" | "banner"; style: "icon" | "banner";
defaultPreview?: string;
previewURL?: string;
width?: number; width?: number;
height?: number; height?: number;
previewURL?: string;
defaultPreview?: string;
desaturateDefault?: boolean
} }
| { | {
style: "attachment"; style: "attachment";
@ -44,7 +41,12 @@ type Props = {
cancel: () => void; cancel: () => void;
size?: number; size?: number;
} }
);
type Props = BehaviourType & StyleType & {
fileType: "backgrounds" | "icons" | "avatars" | "attachments" | "banners";
maxFileSize: number;
remove: () => Promise<void>;
}
export async function uploadFile( export async function uploadFile(
autumnURL: string, autumnURL: string,
@ -224,7 +226,7 @@ export function FileUploader(props: Props) {
})} })}
data-uploading={uploading}> data-uploading={uploading}>
<div <div
className={styles.image} className={classNames(styles.image, props.desaturateDefault && previewURL == null && styles.desaturate)}
style={{ style={{
backgroundImage: backgroundImage:
style === "icon" style === "icon"