diff --git a/api/assets/fosscord-login.css b/api/assets/fosscord-login.css
index 34cf542b..d507c545 100644
--- a/api/assets/fosscord-login.css
+++ b/api/assets/fosscord-login.css
@@ -26,7 +26,6 @@ h3.title-jXR8lp.marginBottom8-AtZOdT.base-1x0h_U.size24-RIRrxO::after {
width: 130px;
height: 23px;
background-size: contain;
- border-radius: 50%;
}
/* replace TOS text */
diff --git a/api/client_test/developers.html b/api/client_test/developers.html
new file mode 100644
index 00000000..2a4402d7
--- /dev/null
+++ b/api/client_test/developers.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html class="theme-dark" data-theme="dark">
+ <head>
+ <meta charset="utf-8" />
+ <meta content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=no" name="viewport" />
+
+ <link rel="stylesheet" href="/assets/532.03aaeef88460fae60534.css" integrity="" />
+ <link rel="icon" href="/assets/07dca80a102d4149e9736d4b162cff6f.ico" />
+ <title>Discord Test Client Developer Portal</title>
+ <meta charset="utf-8" data-react-helmet="true" />
+ </head>
+
+ <body>
+ <div id="app-mount"></div>
+ <script>
+ window.GLOBAL_ENV = {
+ API_VERSION: 9,
+ API_ENDPOINT: "/api",
+ WEBAPP_ENDPOINT: "",
+ CDN_HOST: `${location.hostname}:3003`,
+
+ BRAINTREE_KEY: "production_5st77rrc_49pp2rp4phym7387",
+ STRIPE_KEY: "pk_live_CUQtlpQUF0vufWpnpUmQvcdi",
+ MARKETING_ENDPOINT: "//discord.com",
+ RELEASE_CHANNEL: "stable",
+ ALGOLIA_KEY: "aca0d7082e4e63af5ba5917d5e96bed0"
+ };
+ GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST;
+ const localStorage = window.localStorage;
+ // TODO: remote auth
+ // window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, "");
+ localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT);
+ localStorage.setItem(
+ "DeveloperOptionsStore",
+ `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}`
+ );
+ </script>
+ <script src="/assets/41fde19fdf180f3d4315.js" integrity=""></script>
+ <script src="/assets/7b04a3ab10e05dd9054e.js" integrity=""></script>
+ <script src="/assets/d1f811da193e5648048b.js" integrity=""></script>
+ </body>
+</html>
diff --git a/api/src/middlewares/TestClient.ts b/api/src/middlewares/TestClient.ts
index 5c0b081b..ecf87681 100644
--- a/api/src/middlewares/TestClient.ts
+++ b/api/src/middlewares/TestClient.ts
@@ -83,6 +83,15 @@ export default function TestClient(app: Application) {
return res.send(buffer);
});
+ app.get("/developers*", (req: Request, res: Response) => {
+ const { useTestClient } = Config.get().client;
+ res.set("Cache-Control", "public, max-age=" + 60 * 60 * 24);
+ res.set("content-type", "text/html");
+
+ if(!useTestClient) return res.send("Test client is disabled on this instance. Use a stand-alone client to connect this instance.")
+
+ res.send(fs.readFileSync(path.join(__dirname, "..", "..", "client_test", "developers.html"), { encoding: "utf8" }));
+ });
app.get("*", (req: Request, res: Response) => {
const { useTestClient } = Config.get().client;
res.set("Cache-Control", "public, max-age=" + 60 * 60 * 24);
diff --git a/api/src/routes/applications/detectable.ts b/api/src/routes/applications/detectable.ts
index 411e95bf..28ce42da 100644
--- a/api/src/routes/applications/detectable.ts
+++ b/api/src/routes/applications/detectable.ts
@@ -5,7 +5,7 @@ const router: Router = Router();
router.get("/", route({}), async (req: Request, res: Response) => {
//TODO
- res.json([]).status(200);
+ res.send([]).status(200);
});
export default router;
diff --git a/api/src/routes/applications/index.ts b/api/src/routes/applications/index.ts
new file mode 100644
index 00000000..28ce42da
--- /dev/null
+++ b/api/src/routes/applications/index.ts
@@ -0,0 +1,11 @@
+import { Request, Response, Router } from "express";
+import { route } from "@fosscord/api";
+
+const router: Router = Router();
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+ //TODO
+ res.send([]).status(200);
+});
+
+export default router;
diff --git a/api/src/routes/discoverable-guilds.ts b/api/src/routes/discoverable-guilds.ts
index 1cf56f84..0aa2baa9 100644
--- a/api/src/routes/discoverable-guilds.ts
+++ b/api/src/routes/discoverable-guilds.ts
@@ -6,15 +6,29 @@ import { route } from "@fosscord/api";
const router = Router();
router.get("/", route({}), async (req: Request, res: Response) => {
- const { limit } = req.params;
- var showAllGuilds = Config.get().guild.showAllGuildsInDiscovery;
+ const { offset, limit, categories } = req.query;
+ var showAllGuilds = Config.get().guild.discovery.showAllGuilds;
+ var configLimit = Config.get().guild.discovery.limit;
// ! this only works using SQL querys
// TODO: implement this with default typeorm query
// const guilds = await Guild.find({ where: { features: "DISCOVERABLE" } }); //, take: Math.abs(Number(limit)) });
- const guilds = showAllGuilds
- ? await Guild.find({ take: Math.abs(Number(limit || 20)) })
- : await Guild.find({ where: `"features" LIKE '%COMMUNITY%'`, take: Math.abs(Number(limit || 20)) });
- res.send({ guilds: guilds });
+ let guilds;
+ if (categories == undefined) {
+ guilds = showAllGuilds
+ ? await Guild.find({ take: Math.abs(Number(limit || configLimit)) })
+ : await Guild.find({ where: `"features" LIKE '%DISCOVERABLE%'`, take: Math.abs(Number(limit || configLimit)) });
+ } else {
+ guilds = showAllGuilds
+ ? await Guild.find({ where: `"primary_category_id" = ${categories}`, take: Math.abs(Number(limit || configLimit)) })
+ : await Guild.find({
+ where: `"primary_category_id" = ${categories} AND "features" LIKE '%DISCOVERABLE%'`,
+ take: Math.abs(Number(limit || configLimit))
+ });
+ }
+
+ const total = guilds ? guilds.length : undefined;
+
+ res.send({ total: total, guilds: guilds, offset: Number(offset || Config.get().guild.discovery.offset), limit: Number(limit || configLimit) });
});
export default router;
diff --git a/api/src/routes/discovery.ts b/api/src/routes/discovery.ts
index bc495d42..1991400e 100644
--- a/api/src/routes/discovery.ts
+++ b/api/src/routes/discovery.ts
@@ -1,12 +1,18 @@
+import { Categories } from "@fosscord/util";
import { Router, Response, Request } from "express";
import { route } from "@fosscord/api";
const router = Router();
-router.get("/categories", route({}), (req: Request, res: Response) => {
+router.get("/categories", route({}), async (req: Request, res: Response) => {
// TODO:
- //const { locale, primary_only } = req.query;
- res.json([]).status(200);
+ // Get locale instead
+
+ const { locale, primary_only } = req.query;
+
+ const out = primary_only ? await Categories.find() : await Categories.find({ where: `"is_primary" = "true"` });
+
+ res.send(out);
});
export default router;
diff --git a/api/src/routes/experiments.ts b/api/src/routes/experiments.ts
index 966ed99c..7be86fb8 100644
--- a/api/src/routes/experiments.ts
+++ b/api/src/routes/experiments.ts
@@ -5,7 +5,7 @@ const router = Router();
router.get("/", route({}), (req: Request, res: Response) => {
// TODO:
- res.send({ fingerprint: "", assignments: [] });
+ res.send({ fingerprint: "", assignments: [], guild_experiments:[] });
});
export default router;
diff --git a/api/src/routes/guild-recommendations.ts b/api/src/routes/guild-recommendations.ts
index 503b19b7..1432f39c 100644
--- a/api/src/routes/guild-recommendations.ts
+++ b/api/src/routes/guild-recommendations.ts
@@ -6,15 +6,18 @@ import { route } from "@fosscord/api";
const router = Router();
router.get("/", route({}), async (req: Request, res: Response) => {
- const { limit, personalization_disabled } = req.params;
- var showAllGuilds = Config.get().guild.showAllGuildsInDiscovery;
+ const { limit, personalization_disabled } = req.query;
+ var showAllGuilds = Config.get().guild.discovery.showAllGuilds;
// ! this only works using SQL querys
// TODO: implement this with default typeorm query
// const guilds = await Guild.find({ where: { features: "DISCOVERABLE" } }); //, take: Math.abs(Number(limit)) });
+
+ const genLoadId = (size: Number) => [...Array(size)].map(() => Math.floor(Math.random() * 16).toString(16)).join('');
+
const guilds = showAllGuilds
- ? await Guild.find({ take: Math.abs(Number(limit || 20)) })
- : await Guild.find({ where: `"features" LIKE '%COMMUNITY%'`, take: Math.abs(Number(limit || 100)) });
- res.send({ recommended_guilds: guilds });
+ ? await Guild.find({ take: Math.abs(Number(limit || 24)) })
+ : await Guild.find({ where: `"features" LIKE '%DISCOVERABLE%'`, take: Math.abs(Number(limit || 24)) });
+ res.send({ recommended_guilds: guilds, load_id: `server_recs/${genLoadId(32)}`}).status(200);
});
export default router;
diff --git a/api/src/routes/guilds/#guild_id/discovery-requirements.ts b/api/src/routes/guilds/#guild_id/discovery-requirements.ts
new file mode 100644
index 00000000..ad20633f
--- /dev/null
+++ b/api/src/routes/guilds/#guild_id/discovery-requirements.ts
@@ -0,0 +1,39 @@
+import { Guild, Config } from "@fosscord/util";
+
+import { Router, Request, Response } from "express";
+import { route } from "@fosscord/api";
+
+const router = Router();
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+ const { guild_id } = req.params;
+ // TODO:
+ // Load from database
+ // Admin control, but for now it allows anyone to be discoverable
+
+ res.send({
+ guild_id: guild_id,
+ safe_environment: true,
+ healthy: true,
+ health_score_pending: false,
+ size: true,
+ nsfw_properties: {},
+ protected: true,
+ sufficient: true,
+ sufficient_without_grace_period: true,
+ valid_rules_channel: true,
+ retention_healthy: true,
+ engagement_healthy: true,
+ age: true,
+ minimum_age: 0,
+ health_score: {
+ avg_nonnew_participators: 0,
+ avg_nonnew_communicators: 0,
+ num_intentful_joiners: 0,
+ perc_ret_w1_intentful: 0
+ },
+ minimum_size: 0
+ });
+});
+
+export default router;
diff --git a/api/src/routes/guilds/#guild_id/index.ts b/api/src/routes/guilds/#guild_id/index.ts
index d8ee86ff..991c3f93 100644
--- a/api/src/routes/guilds/#guild_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/index.ts
@@ -34,7 +34,7 @@ router.get("/", route({}), async (req: Request, res: Response) => {
// @ts-ignore
guild.joined_at = member?.joined_at;
- return res.json(guild);
+ return res.send(guild);
});
router.patch("/", route({ body: "GuildUpdateSchema", permission: "MANAGE_GUILD" }), async (req: Request, res: Response) => {
diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
index ab489743..24c74af7 100644
--- a/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
+++ b/api/src/routes/guilds/#guild_id/members/#member_id/index.ts
@@ -1,5 +1,5 @@
import { Request, Response, Router } from "express";
-import { Member, getPermission, Role, GuildMemberUpdateEvent, emitEvent } from "@fosscord/util";
+import { Member, getPermission, Role, GuildMemberUpdateEvent, emitEvent, Sticker, Emoji, Guild } from "@fosscord/util";
import { HTTPError } from "lambert-server";
import { route } from "@fosscord/api";
@@ -43,13 +43,26 @@ router.patch("/", route({ body: "MemberChangeSchema" }), async (req: Request, re
});
router.put("/", route({}), async (req: Request, res: Response) => {
+
+ // TODO: Lurker mode
+
let { guild_id, member_id } = req.params;
if (member_id === "@me") member_id = req.user_id;
- throw new HTTPError("Maintenance: Currently you can't add a member", 403);
- // TODO: only for oauth2 applications
+ var guild = await Guild.findOneOrFail({
+ where: { id: guild_id } });
+
+ var emoji = await Emoji.find({
+ where: { guild_id: guild_id } });
+
+ var roles = await Role.find({
+ where: { guild_id: guild_id } });
+
+ var stickers = await Sticker.find({
+ where: { guild_id: guild_id } });
+
await Member.addToGuild(member_id, guild_id);
- res.sendStatus(204);
+ res.send({...guild, emojis: emoji, roles: roles, stickers: stickers});
});
router.delete("/", route({ permission: "KICK_MEMBERS" }), async (req: Request, res: Response) => {
diff --git a/api/src/routes/partners/#guild_id/requirements.ts b/api/src/routes/partners/#guild_id/requirements.ts
new file mode 100644
index 00000000..545c5c78
--- /dev/null
+++ b/api/src/routes/partners/#guild_id/requirements.ts
@@ -0,0 +1,40 @@
+
+import { Guild, Config } from "@fosscord/util";
+
+import { Router, Request, Response } from "express";
+import { route } from "@fosscord/api";
+
+const router = Router();
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+ const { guild_id } = req.params;
+ // TODO:
+ // Load from database
+ // Admin control, but for now it allows anyone to be discoverable
+
+ res.send({
+ guild_id: guild_id,
+ safe_environment: true,
+ healthy: true,
+ health_score_pending: false,
+ size: true,
+ nsfw_properties: {},
+ protected: true,
+ sufficient: true,
+ sufficient_without_grace_period: true,
+ valid_rules_channel: true,
+ retention_healthy: true,
+ engagement_healthy: true,
+ age: true,
+ minimum_age: 0,
+ health_score: {
+ avg_nonnew_participators: 0,
+ avg_nonnew_communicators: 0,
+ num_intentful_joiners: 0,
+ perc_ret_w1_intentful: 0
+ },
+ minimum_size: 0
+ });
+});
+
+export default router;
diff --git a/api/src/routes/teams.ts b/api/src/routes/teams.ts
new file mode 100644
index 00000000..7ce3abcb
--- /dev/null
+++ b/api/src/routes/teams.ts
@@ -0,0 +1,11 @@
+import { Request, Response, Router } from "express";
+import { route } from "@fosscord/api";
+
+const router: Router = Router();
+
+router.get("/", route({}), async (req: Request, res: Response) => {
+ //TODO
+ res.send([]);
+});
+
+export default router;
diff --git a/api/src/routes/users/@me/guilds.ts b/api/src/routes/users/@me/guilds.ts
index 22a2c04c..754a240e 100644
--- a/api/src/routes/users/@me/guilds.ts
+++ b/api/src/routes/users/@me/guilds.ts
@@ -8,7 +8,13 @@ const router: Router = Router();
router.get("/", route({}), async (req: Request, res: Response) => {
const members = await Member.find({ relations: ["guild"], where: { id: req.user_id } });
- res.json(members.map((x) => x.guild));
+ let guild = members.map((x) => x.guild);
+
+ if ("with_counts" in req.query && req.query.with_counts == "true") {
+ guild = []; // TODO: Load guilds with user role permissions number
+ }
+
+ res.json(guild);
});
// user send to leave a certain guild
diff --git a/api/src/util/handlers/route.ts b/api/src/util/handlers/route.ts
index 05658ad3..0048c4dd 100644
--- a/api/src/util/handlers/route.ts
+++ b/api/src/util/handlers/route.ts
@@ -73,7 +73,7 @@ const normalizeBody = (body: any = {}) => {
} else {
for (const [key, value] of Object.entries(object)) {
if (value == null) {
- if (key === "icon" || key === "avatar" || key === "banner" || key === "splash") continue;
+ if (key === "icon" || key === "avatar" || key === "banner" || key === "splash" || key === "discovery_splash") continue;
delete object[key];
} else if (typeof value === "object") {
normalizeObject(value);
|
