mirror of
https://github.com/revoltchat/revite.git
synced 2024-11-09 08:43:37 -05:00
parent
4ccfaea973
commit
08e1db6d35
6 changed files with 53 additions and 20 deletions
|
@ -91,7 +91,7 @@
|
|||
"@fontsource/ubuntu-mono": "^4.4.5",
|
||||
"@hcaptcha/react-hcaptcha": "^0.3.6",
|
||||
"@preact/preset-vite": "^2.0.0",
|
||||
"@revoltchat/ui": "1.0.28",
|
||||
"@revoltchat/ui": "1.0.31",
|
||||
"@rollup/plugin-replace": "^2.4.2",
|
||||
"@styled-icons/boxicons-logos": "^10.38.0",
|
||||
"@styled-icons/boxicons-regular": "^10.38.0",
|
||||
|
@ -149,7 +149,7 @@
|
|||
"react-scroll": "^1.8.2",
|
||||
"react-virtualized-auto-sizer": "^1.0.5",
|
||||
"react-virtuoso": "^1.10.4",
|
||||
"revolt.js": "6.0.0-rc.21",
|
||||
"revolt.js": "6.0.0-rc.24",
|
||||
"rimraf": "^3.0.2",
|
||||
"sass": "^1.35.1",
|
||||
"shade-blend-color": "^1.0.0",
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { API } from "revolt.js";
|
||||
import { API, Channel, Member, Server } from "revolt.js";
|
||||
import { Permission } from "revolt.js";
|
||||
|
||||
import { PermissionSelect } from "./PermissionSelect";
|
||||
|
@ -7,10 +7,11 @@ interface Props {
|
|||
value: API.OverrideField | number;
|
||||
onChange: (v: API.OverrideField | number) => void;
|
||||
|
||||
target?: Channel | Server;
|
||||
filter?: (keyof typeof Permission)[];
|
||||
}
|
||||
|
||||
export function PermissionList({ value, onChange, filter }: Props) {
|
||||
export function PermissionList({ value, onChange, filter, target }: Props) {
|
||||
return (
|
||||
<>
|
||||
{(Object.keys(Permission) as (keyof typeof Permission)[])
|
||||
|
@ -35,6 +36,7 @@ export function PermissionList({ value, onChange, filter }: Props) {
|
|||
permission={Permission[x]}
|
||||
value={value}
|
||||
onChange={onChange}
|
||||
target={target}
|
||||
/>
|
||||
))}
|
||||
</>
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
import { Lock } from "@styled-icons/boxicons-solid";
|
||||
import Long from "long";
|
||||
import { API } from "revolt.js";
|
||||
import { API, Channel, Member, Server } from "revolt.js";
|
||||
import { Permission } from "revolt.js";
|
||||
import styled from "styled-components";
|
||||
import styled, { css } from "styled-components";
|
||||
|
||||
import { Text } from "preact-i18n";
|
||||
import { useMemo } from "preact/hooks";
|
||||
|
@ -11,6 +12,7 @@ import { OverrideSwitch } from "@revoltchat/ui";
|
|||
|
||||
interface PermissionSelectProps {
|
||||
id: keyof typeof Permission;
|
||||
target?: Channel | Server;
|
||||
permission: number;
|
||||
value: API.OverrideField | number;
|
||||
onChange: (value: API.OverrideField | number) => void;
|
||||
|
@ -18,7 +20,7 @@ interface PermissionSelectProps {
|
|||
|
||||
type State = "Allow" | "Neutral" | "Deny";
|
||||
|
||||
const PermissionEntry = styled.label`
|
||||
const PermissionEntry = styled.label<{ disabled?: boolean }>`
|
||||
gap: 8px;
|
||||
width: 100%;
|
||||
margin: 8px 0;
|
||||
|
@ -33,10 +35,20 @@ const PermissionEntry = styled.label`
|
|||
flex-direction: column;
|
||||
}
|
||||
|
||||
.lock {
|
||||
margin-inline-start: 4px;
|
||||
}
|
||||
|
||||
.description {
|
||||
font-size: 0.8em;
|
||||
color: var(--secondary-foreground);
|
||||
}
|
||||
|
||||
${(props) =>
|
||||
props.disabled &&
|
||||
css`
|
||||
color: var(--tertiary-foreground);
|
||||
`}
|
||||
`;
|
||||
|
||||
export function PermissionSelect({
|
||||
|
@ -44,6 +56,7 @@ export function PermissionSelect({
|
|||
permission,
|
||||
value,
|
||||
onChange,
|
||||
target,
|
||||
}: PermissionSelectProps) {
|
||||
const state: State = useMemo(() => {
|
||||
if (typeof value === "object") {
|
||||
|
@ -97,18 +110,32 @@ export function PermissionSelect({
|
|||
});
|
||||
}
|
||||
|
||||
const member =
|
||||
target &&
|
||||
(target instanceof Server ? target.member : target.server?.member);
|
||||
|
||||
const disabled = member && !member.hasPermission(target!, id);
|
||||
|
||||
return (
|
||||
<PermissionEntry>
|
||||
<PermissionEntry disabled={disabled}>
|
||||
<span class="title">
|
||||
<Text id={`permissions.${id}.t`}>{id}</Text>
|
||||
<span>
|
||||
<Text id={`permissions.${id}.t`}>{id}</Text>
|
||||
{disabled && <Lock className="lock" size={14} />}
|
||||
</span>
|
||||
<span class="description">
|
||||
<Text id={`permissions.${id}.d`} />
|
||||
</span>
|
||||
</span>
|
||||
{typeof value === "object" ? (
|
||||
<OverrideSwitch state={state} onChange={onSwitch} />
|
||||
<OverrideSwitch
|
||||
disabled={disabled}
|
||||
state={state}
|
||||
onChange={onSwitch}
|
||||
/>
|
||||
) : (
|
||||
<Checkbox
|
||||
disabled={disabled}
|
||||
checked={state === "Allow"}
|
||||
onChange={() =>
|
||||
onChange(
|
||||
|
|
|
@ -46,6 +46,7 @@ export default observer(({ channel }: Props) => {
|
|||
return (
|
||||
<PermissionsLayout
|
||||
channel={channel}
|
||||
rank={channel.server?.member?.ranking ?? Infinity}
|
||||
editor={({ selected }) => {
|
||||
const currentRole = currentRoles.find(
|
||||
(x) => x.id === selected,
|
||||
|
@ -110,6 +111,7 @@ export default observer(({ channel }: Props) => {
|
|||
"UploadFiles",
|
||||
"Masquerade",
|
||||
]}
|
||||
target={channel}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
|
|
@ -55,6 +55,7 @@ export const Roles = observer(({ server }: Props) => {
|
|||
return (
|
||||
<PermissionsLayout
|
||||
server={server}
|
||||
rank={server.member?.ranking ?? Infinity}
|
||||
onCreateRole={(callback) =>
|
||||
openScreen({
|
||||
id: "special_input",
|
||||
|
@ -214,6 +215,7 @@ export const Roles = observer(({ server }: Props) => {
|
|||
permissions,
|
||||
} as RoleOrDefault)
|
||||
}
|
||||
target={server}
|
||||
/>
|
||||
{selected !== "default" && (
|
||||
<>
|
||||
|
|
20
yarn.lock
20
yarn.lock
|
@ -2096,9 +2096,9 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@revoltchat/ui@npm:1.0.28":
|
||||
version: 1.0.28
|
||||
resolution: "@revoltchat/ui@npm:1.0.28"
|
||||
"@revoltchat/ui@npm:1.0.31":
|
||||
version: 1.0.31
|
||||
resolution: "@revoltchat/ui@npm:1.0.31"
|
||||
dependencies:
|
||||
"@styled-icons/boxicons-logos": ^10.38.0
|
||||
"@styled-icons/boxicons-regular": ^10.38.0
|
||||
|
@ -2107,7 +2107,7 @@ __metadata:
|
|||
mobx-react-lite: ^3.3.0
|
||||
peerDependencies:
|
||||
revolt-api: "*"
|
||||
checksum: 7998050ddcc31eade913da402509382e27a39e68697d8d31500a95dd40a7cffa1eadbec2a8630c82c6fc83e90a8d536b802858030aa6d6193fffcf78dac85bfb
|
||||
checksum: 8f93757d131ae7d784e744b774f6f6b9bea4e09a3fb48762334caf23e4ab08db209649eba1435f9fa82bdf7bfbfb78100fef6d13e7e0f715d0e2c82c52abf74d
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
@ -3395,7 +3395,7 @@ __metadata:
|
|||
"@hcaptcha/react-hcaptcha": ^0.3.6
|
||||
"@insertish/vite-plugin-babel-macros": ^1.0.5
|
||||
"@preact/preset-vite": ^2.0.0
|
||||
"@revoltchat/ui": 1.0.28
|
||||
"@revoltchat/ui": 1.0.31
|
||||
"@rollup/plugin-replace": ^2.4.2
|
||||
"@styled-icons/boxicons-logos": ^10.38.0
|
||||
"@styled-icons/boxicons-regular": ^10.38.0
|
||||
|
@ -3456,7 +3456,7 @@ __metadata:
|
|||
react-scroll: ^1.8.2
|
||||
react-virtualized-auto-sizer: ^1.0.5
|
||||
react-virtuoso: ^1.10.4
|
||||
revolt.js: 6.0.0-rc.21
|
||||
revolt.js: 6.0.0-rc.24
|
||||
rimraf: ^3.0.2
|
||||
sass: ^1.35.1
|
||||
shade-blend-color: ^1.0.0
|
||||
|
@ -6762,9 +6762,9 @@ __metadata:
|
|||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"revolt.js@npm:6.0.0-rc.21":
|
||||
version: 6.0.0-rc.21
|
||||
resolution: "revolt.js@npm:6.0.0-rc.21"
|
||||
"revolt.js@npm:6.0.0-rc.24":
|
||||
version: 6.0.0-rc.24
|
||||
resolution: "revolt.js@npm:6.0.0-rc.24"
|
||||
dependencies:
|
||||
"@insertish/exponential-backoff": 3.1.0-patch.2
|
||||
"@insertish/isomorphic-ws": ^4.0.1
|
||||
|
@ -6778,7 +6778,7 @@ __metadata:
|
|||
revolt-api: 0.5.3-rc.15
|
||||
ulid: ^2.3.0
|
||||
ws: ^8.2.2
|
||||
checksum: 547cf4a11ef591351523f19707c8d6ee306a82f965da6db2b63217067dea19244fc8125c362bcf0c32f727f2ba351b748f176a633f2420ee37599bef35942c6f
|
||||
checksum: 1ecfd839632f38ef16e85165c97b236e7f1b17ee918604bc28d82a8af4a8375c0bac1f91ba977be0e9e65137b55e2a9f767dc1dc14c62fe81c44a3d41eb7f581
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
|
Loading…
Reference in a new issue