cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-12-25 23:22:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #223 from brecert/identity-fix

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/context/intermediate/popovers/ServerIdentityModal.tsx
View file

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

4
src/context/revoltjs/FileUploads.module.scss
View file

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

60
src/context/revoltjs/FileUploads.tsx
View file

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