From a2f57627913bf5d402b73933374693382a387ed2 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Mon, 24 Oct 2022 19:46:33 +1100 Subject: [PATCH] Forgot some schemas + only generate schemas in util/schemas + add setup script --- assets/public/fosscord.css | 46 ------------------ assets/public/user.css | 1 - assets/schemas.json | Bin 1158849 -> 813547 bytes package.json | 1 + scripts/schema.js | 5 +- src/api/routes/guilds/#guild_id/channels.ts | 8 +-- .../routes/guilds/#guild_id/roles/index.ts | 6 +-- src/util/schemas/ChannelReorderSchema.ts | 6 +++ src/util/schemas/RolePositionUpdateSchema.ts | 4 ++ src/util/schemas/index.ts | 4 +- 10 files changed, 20 insertions(+), 61 deletions(-) create mode 100644 src/util/schemas/ChannelReorderSchema.ts create mode 100644 src/util/schemas/RolePositionUpdateSchema.ts diff --git a/assets/public/fosscord.css b/assets/public/fosscord.css index 6078fdeb..e69de29b 100644 --- a/assets/public/fosscord.css +++ b/assets/public/fosscord.css @@ -1,46 +0,0 @@ - -/* loading spinner */ -#app-mount > div.app-1q1i1E > div.container-16j22k.fixClipping-3qAKRb > div.content-1-zrf2 > video { - filter: opacity(1); - background: url("http://www.clipartbest.com/cliparts/7ca/6Rr/7ca6RrLAi.gif"); - background-size: contain; - /* width: 64px; - height: 64px; */ - padding-bottom: 64px; - background-repeat: no-repeat; -} - -/* home button icon */ -#app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > nav > ul > div.scroller-1Bvpku.none-2Eo-qx.scrollerBase-289Jih > div.tutorialContainer-2sGCg9 > div > div.listItemWrapper-KhRmzM > div > svg > foreignObject > div > div -{ - background-image: url(https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Icon-Rounded-Subtract.svg); - background-size: contain; - border-radius: 50%; -} - -#app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > nav > ul > div.scroller-1Bvpku.none-2Eo-qx.scrollerBase-289Jih > div.tutorialContainer-2sGCg9 > div > div.listItemWrapper-KhRmzM > div > svg > foreignObject > div > div, #app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > nav > ul > div.scroller-1Bvpku.none-2Eo-qx.scrollerBase-289Jih > div.tutorialContainer-2sGCg9 > div > div.listItemWrapper-KhRmzM > div > svg > foreignObject > div > div:hover { - background-color: white; -} -/* Login QR */ -#app-mount > div.app-1q1i1E > div > div > div > div > form > div > div > div.transitionGroup-aR7y1d.qrLogin-1AOZMt, -#app-mount > div.app-1q1i1E > div > div > div > div > form > div > div > div.verticalSeparator-3huAjp, -/* Remove login bg */ -#app-mount > div.app-1q1i1E > div > svg, -/* Download bar */ -#app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > div > div.notice-3bPHh-.colorDefault-22HBa0, -/* Connection problem links */ -#app-mount > div.app-1q1i1E > div.container-16j22k.fixClipping-3qAKRb > div.problems-3mgf6w.slideIn-sCvzGz > div:nth-child(2), -/* Downloads button */ -#app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > nav > ul > div.scroller-1Bvpku.none-2Eo-qx.scrollerBase-289Jih > div:nth-child(7) > div.listItemWrapper-KhRmzM > div > svg > foreignObject > div, -#app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > nav > ul > div.scroller-1Bvpku.none-2Eo-qx.scrollerBase-289Jih > div:nth-child(6) > div, -/* help button */ -#app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > div > div.content-98HsJk > div.chat-3bRxxu > section > div.toolbar-1t6TWx > a, -/* download button start of guild */ -#chat-messages-899316648933185083 > div > div > div:nth-child(5), -/* Thread permissions etc popups */ -#app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > div > div.content-98HsJk > div.sidebar-2K8pFh.hasNotice-1XRy4h > nav > div.container-3O_wAf, -/* home button icon */ -#app-mount > div.app-1q1i1E > div > div.layers-3iHuyZ.layers-3q14ss > div > div > nav > ul > div.scroller-1Bvpku.none-2Eo-qx.scrollerBase-289Jih > div.tutorialContainer-2sGCg9 > div > div.listItemWrapper-KhRmzM > div > svg > foreignObject > div > div > svg -{ - display: none; -} \ No newline at end of file diff --git a/assets/public/user.css b/assets/public/user.css index a7e5c4f3..e69de29b 100644 --- a/assets/public/user.css +++ b/assets/public/user.css @@ -1 +0,0 @@ -/* Your custom CSS goes here, enjoy! */ \ No newline at end of file diff --git a/assets/schemas.json b/assets/schemas.json index 54c5c37dffeac517d7a680e7bef67e1990e10d0a..464eeb66e7226bb6183a3a738ddd771a6c5cd2ff 100644 GIT binary patch delta 457 zcmX?j*X{LX!wuikCZ9hVx>>XMgxluxN9|ofyzP$SjDoIH<5|MCw`DMX@&mKh9A@0= zvfW;UDa;+L=0rNvMi($^%?_sj5PkQ!n4R3fV!^S@Y!Ft@dgiY#TjNgx3OVM zaf7J5(Z?nav0Cc^n}zH2ctxJb?K2J8AGm{*hHYQl%Ff{mW=;n(dA5JO#(o=O9kT|9 zEyRl@l^hQtVjZVACO}x;(wwSbbEoe=$jQ2WMGof^h=YJ!4zT|r68}ZG;{Cxcomjwi zARNq^uENdc4sqVqa_$x0V8IRNxi7kI2Rd((7sL~@)A^DhHUOpAw-<}@eRkche}&5w n;(%#k0xuyR-@II43P>z$d-V^2E*FRwZ9E0TBY}c`OkA}9QA*Pt delta 59549 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 AdjJ3c diff --git a/package.json b/package.json index 37a21647..47424da3 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "postinstall": "npx patch-package", "start": "node dist/bundle/start.js", "build": "tsc -p .", + "setup": "npm run build && npm run generate:schema", "generate:rights": "node scripts/rights.js", "generate:schema": "node scripts/schema.js", "generate:client": "node scripts/client.js" diff --git a/scripts/schema.js b/scripts/schema.js index 90a346c9..debae7e1 100644 --- a/scripts/schema.js +++ b/scripts/schema.js @@ -47,7 +47,10 @@ function modify(obj) { } function main() { - const program = TJS.programFromConfig("tsconfig.json"); + const program = TJS.programFromConfig( + "tsconfig.json", + walk(path.join(__dirname, "..", "src", "util", "schemas")) + ); const generator = TJS.buildGenerator(program, settings); if (!generator || !program) return; diff --git a/src/api/routes/guilds/#guild_id/channels.ts b/src/api/routes/guilds/#guild_id/channels.ts index af17465d..eae93607 100644 --- a/src/api/routes/guilds/#guild_id/channels.ts +++ b/src/api/routes/guilds/#guild_id/channels.ts @@ -4,6 +4,7 @@ import { ChannelUpdateEvent, emitEvent, ChannelModifySchema, + ChannelReorderSchema, } from "@fosscord/util"; import { HTTPError } from "lambert-server"; import { route } from "@fosscord/api"; @@ -33,13 +34,6 @@ router.post( }, ); -export type ChannelReorderSchema = { - id: string; - position?: number; - lock_permissions?: boolean; - parent_id?: string; -}[]; - router.patch( "/", route({ body: "ChannelReorderSchema", permission: "MANAGE_CHANNELS" }), diff --git a/src/api/routes/guilds/#guild_id/roles/index.ts b/src/api/routes/guilds/#guild_id/roles/index.ts index e3c7373e..60399d1b 100644 --- a/src/api/routes/guilds/#guild_id/roles/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/index.ts @@ -9,16 +9,12 @@ import { Config, DiscordApiErrors, RoleModifySchema, + RolePositionUpdateSchema, } from "@fosscord/util"; import { route } from "@fosscord/api"; const router: Router = Router(); -export type RolePositionUpdateSchema = { - id: string; - position: number; -}[]; - router.get("/", route({}), async (req: Request, res: Response) => { const guild_id = req.params.guild_id; diff --git a/src/util/schemas/ChannelReorderSchema.ts b/src/util/schemas/ChannelReorderSchema.ts new file mode 100644 index 00000000..6eb4cdd5 --- /dev/null +++ b/src/util/schemas/ChannelReorderSchema.ts @@ -0,0 +1,6 @@ +export type ChannelReorderSchema = { + id: string; + position?: number; + lock_permissions?: boolean; + parent_id?: string; +}[]; \ No newline at end of file diff --git a/src/util/schemas/RolePositionUpdateSchema.ts b/src/util/schemas/RolePositionUpdateSchema.ts new file mode 100644 index 00000000..1019d504 --- /dev/null +++ b/src/util/schemas/RolePositionUpdateSchema.ts @@ -0,0 +1,4 @@ +export type RolePositionUpdateSchema = { + id: string; + position: number; +}[]; \ No newline at end of file diff --git a/src/util/schemas/index.ts b/src/util/schemas/index.ts index ba9e71e4..8881b247 100644 --- a/src/util/schemas/index.ts +++ b/src/util/schemas/index.ts @@ -42,4 +42,6 @@ export * from "./LazyRequestSchema"; export * from "./GuildUpdateSchema"; export * from "./ChannelPermissionOverwriteSchema"; export * from "./UserGuildSettingsSchema"; -export * from "./GatewayPayloadSchema" \ No newline at end of file +export * from "./GatewayPayloadSchema"; +export * from "./RolePositionUpdateSchema"; +export * from "./ChannelReorderSchema"; \ No newline at end of file