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 54c5c37d..464eeb66 100644 Binary files a/assets/schemas.json and b/assets/schemas.json differ 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