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);
diff --git a/util/src/entities/Categories.ts b/util/src/entities/Categories.ts
new file mode 100644
index 00000000..81fbc303
--- /dev/null
+++ b/util/src/entities/Categories.ts
@@ -0,0 +1,33 @@
+import { PrimaryColumn, Column, Entity} from "typeorm";
+import { BaseClassWithoutId } from "./BaseClass";
+
+// TODO: categories:
+// [{
+// "id": 16,
+// "default": "Anime & Manga",
+// "localizations": {
+// "de": "Anime & Manga",
+// "fr": "Anim\u00e9s et mangas",
+// "ru": "\u0410\u043d\u0438\u043c\u0435 \u0438 \u043c\u0430\u043d\u0433\u0430"
+// }
+// },
+// "is_primary": false/true
+// }]
+// Also populate discord default categories
+
+@Entity("categories")
+export class Categories extends BaseClassWithoutId { // Not using snowflake
+
+ @PrimaryColumn()
+ id: number;
+
+ @Column({ nullable: true })
+ name: string;
+
+ @Column({ type: "simple-json" })
+ localizations: string;
+
+ @Column({ nullable: true })
+ is_primary: boolean;
+
+}
\ No newline at end of file
diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts
index 6993cc09..f4a266dc 100644
--- a/util/src/entities/Config.ts
+++ b/util/src/entities/Config.ts
@@ -157,7 +157,12 @@ export interface ConfigValue {
available: Region[];
};
guild: {
- showAllGuildsInDiscovery: boolean;
+ discovery: {
+ showAllGuilds: boolean;
+ useRecommendation: boolean; // TODO: Recommendation, privacy concern?
+ offset: number;
+ limit: number;
+ };
autoJoin: {
enabled: boolean;
guilds: string[];
@@ -353,7 +358,12 @@ export const DefaultConfigOptions: ConfigValue = {
],
},
guild: {
- showAllGuildsInDiscovery: false,
+ discovery: {
+ showAllGuilds: false,
+ useRecommendation: false,
+ offset: 0,
+ limit: 24,
+ },
autoJoin: {
enabled: true,
canLeave: true,
diff --git a/util/src/entities/Guild.ts b/util/src/entities/Guild.ts
index 6a1df4d6..9ac148ee 100644
--- a/util/src/entities/Guild.ts
+++ b/util/src/entities/Guild.ts
@@ -17,28 +17,6 @@ import { Webhook } from "./Webhook";
// TODO: guild_scheduled_events
// TODO: stage_instances
// TODO: threads
-// TODO: categories:
-// [{
-// "id": 16,
-// "name": {
-// "default": "Anime & Manga",
-// "localizations": {
-// "de": "Anime & Manga",
-// "fr": "Anim\u00e9s et mangas",
-// "ru": "\u0410\u043d\u0438\u043c\u0435 \u0438 \u043c\u0430\u043d\u0433\u0430"
-// }
-// },
-// "is_primary": false
-// }]
-// TODO:
-// primary_category :{
-// id: 1,
-// name: {
-// default: "Gaming",
-// localizations: { de: "Gaming", fr: "Gaming", ru: "\u0418\u0433\u0440\u044b" },
-// is_primary: true,
-// },
-// };
// TODO:
// "keywords": [
// "Genshin Impact",
@@ -108,6 +86,9 @@ export class Guild extends BaseClass {
//TODO: https://discord.com/developers/docs/resources/guild#guild-object-guild-features
@Column({ nullable: true })
+ primary_category_id: number;
+
+ @Column({ nullable: true })
icon?: string;
@Column({ nullable: true })
@@ -289,6 +270,9 @@ export class Guild extends BaseClass {
@Column({ nullable: true })
nsfw?: boolean;
+ // only for developer portal
+ permissions?: number;
+
static async createGuild(body: {
name?: string;
icon?: string | null;
@@ -306,6 +290,7 @@ export class Guild extends BaseClass {
default_message_notifications: 1, // defaults effect: setting the push default at mentions-only will save a lot
explicit_content_filter: 0,
features: [],
+ primary_category_id: null,
id: guild_id,
max_members: 250000,
max_presences: 250000,
diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts
index 5f2618e0..f157ac39 100644
--- a/util/src/entities/User.ts
+++ b/util/src/entities/User.ts
@@ -256,7 +256,7 @@ export class User extends BaseClass {
disabled: false,
deleted: false,
email: email,
- rights: "0",
+ rights: "0", // TODO: grant rights correctly, as 0 actually stands for no rights at all
nsfw_allowed: true, // TODO: depending on age
public_flags: "0",
flags: "0", // TODO: generate
@@ -283,23 +283,18 @@ export class User extends BaseClass {
}
export const defaultSettings: UserSettings = {
- afk_timeout: 300,
+ afk_timeout: 3600,
allow_accessibility_detection: true,
animate_emoji: true,
animate_stickers: 0,
contact_sync_enabled: false,
convert_emoticons: false,
- custom_status: {
- emoji_id: undefined,
- emoji_name: undefined,
- expires_at: undefined,
- text: undefined,
- },
+ custom_status: null,
default_guilds_restricted: false,
- detect_platform_accounts: true,
- developer_mode: false,
- disable_games_tab: false,
- enable_tts_command: true,
+ detect_platform_accounts: false,
+ developer_mode: true,
+ disable_games_tab: true,
+ enable_tts_command: false,
explicit_content_filter: 0,
friend_source_flags: { all: true },
gateway_connected: false,
@@ -309,17 +304,16 @@ export const defaultSettings: UserSettings = {
inline_attachment_media: true,
inline_embed_media: true,
locale: "en-US",
- message_display_compact: false,
+ message_display_compact: true,
native_phone_integration_enabled: true,
render_embeds: true,
render_reactions: true,
restricted_guilds: [],
show_current_game: true,
status: "online",
- stream_notifications_enabled: true,
+ stream_notifications_enabled: false,
theme: "dark",
- timezone_offset: 0,
- // timezone_offset: // TODO: timezone from request
+ timezone_offset: 0, // TODO: timezone from request
};
export interface UserSettings {
@@ -334,7 +328,7 @@ export interface UserSettings {
emoji_name?: string;
expires_at?: number;
text?: string;
- };
+ } | null;
default_guilds_restricted: boolean;
detect_platform_accounts: boolean;
developer_mode: boolean;
diff --git a/util/src/entities/index.ts b/util/src/entities/index.ts
index c1f979d4..fc18d422 100644
--- a/util/src/entities/index.ts
+++ b/util/src/entities/index.ts
@@ -3,6 +3,7 @@ export * from "./Attachment";
export * from "./AuditLog";
export * from "./Ban";
export * from "./BaseClass";
+export * from "./Categories";
export * from "./Channel";
export * from "./Config";
export * from "./ConnectedAccount";
diff --git a/util/src/util/Categories.ts b/util/src/util/Categories.ts
new file mode 100644
index 00000000..a3c69da7
--- /dev/null
+++ b/util/src/util/Categories.ts
@@ -0,0 +1 @@
+//TODO: populate default discord categories + init, get and set methods
\ No newline at end of file
diff --git a/util/src/util/index.ts b/util/src/util/index.ts
index 98e1146c..f7a273cb 100644
--- a/util/src/util/index.ts
+++ b/util/src/util/index.ts
@@ -1,6 +1,7 @@
export * from "./ApiError";
export * from "./BitField";
export * from "./Token";
+//export * from "./Categories";
export * from "./cdn";
export * from "./Config";
export * from "./Constants";
|
