Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-05 02:12:28 +01:00
Code Issues Releases Activity

Merge branch 'master' of https://github.com/DEVTomatoCake/spacebar-server into feat/local-image-proxy

Browse Source
This commit is contained in:
TomatoCake 2024-08-18 19:00:43 +02:00
commit e24297b67c
18 changed files with 292 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored Normal file
View File

@ -0,0 +1,4 @@
* text=auto
*.sh -crlf
*.nix -crlf
.husky/pre-commit -crlf

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
.DS_STORE
**/.DS_STORE
db/
dist/
node_modules

96
assets/openapi.json
View File

@ -6262,7 +6262,21 @@
"type": "object",
"properties": {
"guild_id": {
"type": "string"
"anyOf": [
{
"type": "array",
"items": [
{
"type": "string"
}
],
"minItems": 1,
"maxItems": 1
},
{
"type": "string"
}
]
},
"query": {
"type": "string"
@ -16619,6 +16633,86 @@
]
}
},
"/channels/{channel_id}/messages/{message_id}/reactions/{emoji}/{burst}/{user_id}": {
"delete": {
"security": [
{
"bearer": []
}
],
"responses": {
"204": {
"description": "No description available"
},
"400": {
"description": "",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/APIErrorResponse"
}
}
}
},
"403": {
"description": "No description available"
},
"404": {
"description": "No description available"
}
},
"parameters": [
{
"name": "channel_id",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "channel_id"
},
{
"name": "message_id",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "message_id"
},
{
"name": "emoji",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "emoji"
},
{
"name": "burst",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "burst"
},
{
"name": "user_id",
"in": "path",
"required": true,
"schema": {
"type": "string"
},
"description": "user_id"
}
],
"tags": [
"channels"
]
}
},
"/channels/{channel_id}/messages/{message_id}/": {
"patch": {
"x-right-required": "SEND_MESSAGES",

16
assets/schemas.json
View File

@ -211519,7 +211519,21 @@
"type": "object",
"properties": {
"guild_id": {
"type": "string"
"anyOf": [
{
"type": "array",
"items": [
{
"type": "string"
}
],
"minItems": 1,
"maxItems": 1
},
{
"type": "string"
}
]
},
"query": {
"type": "string"

2
hashes.json
View File

@ -1,3 +1,3 @@
{
"npmDepsHash": "sha256-q1Q7rpSzfiRvrkoDPER9wjBOzZ5Bn5B+d41MFssM7nU="
"npmDepsHash": "sha256-q1Q7rpSzfiRvrkoDPER9wjBOzZ5Bn5B+d41MFssM7nU="
}

10
src/api/routes/auth/register.ts
View File

@ -287,6 +287,16 @@ router.post(
});
}
const { maxUsername } = Config.get().limits.user;
if (body.username.length > maxUsername) {
throw FieldErrors({
username: {
code: "BASE_TYPE_BAD_LENGTH",
message: `Must be between 2 and ${maxUsername} in length.`,
},
});
}
const user = await User.register({ ...body, req });
if (body.invite) {

49
src/api/routes/channels/#channel_id/pins.ts
View File

@ -18,13 +18,14 @@
import { route } from "@spacebar/api";
import {
Channel,
ChannelPinsUpdateEvent,
Config,
DiscordApiErrors,
emitEvent,
Message,
MessageCreateEvent,
MessageUpdateEvent,
User,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
@ -60,8 +61,34 @@ router.put(
if (pinned_count >= maxPins)
throw DiscordApiErrors.MAXIMUM_PINS.withParams(maxPins);
message.pinned = true;
const author = await User.getPublicUser(req.user_id);
const systemPinMessage = Message.create({
timestamp: new Date(),
type: 6,
guild_id: message.guild_id,
channel_id: message.channel_id,
author,
message_reference: {
message_id: message.id,
channel_id: message.channel_id,
guild_id: message.guild_id,
},
reactions: [],
attachments: [],
embeds: [],
sticker_items: [],
edited_timestamp: undefined,
mentions: [],
mention_channels: [],
mention_roles: [],
mention_everyone: false,
});
await Promise.all([
Message.update({ id: message_id }, { pinned: true }),
message.save(),
emitEvent({
event: "MESSAGE_UPDATE",
channel_id,
@ -76,6 +103,12 @@ router.put(
last_pin_timestamp: undefined,
},
} as ChannelPinsUpdateEvent),
systemPinMessage.save(),
emitEvent({
event: "MESSAGE_CREATE",
channel_id: message.channel_id,
data: systemPinMessage,
} as MessageCreateEvent),
]);
res.sendStatus(204);
@ -98,31 +131,27 @@ router.delete(
async (req: Request, res: Response) => {
const { channel_id, message_id } = req.params;
const channel = await Channel.findOneOrFail({
where: { id: channel_id },
});
if (channel.guild_id) req.permission?.hasThrow("MANAGE_MESSAGES");
const message = await Message.findOneOrFail({
where: { id: message_id },
});
if (message.guild_id) req.permission?.hasThrow("MANAGE_MESSAGES");
message.pinned = false;
await Promise.all([
message.save(),
emitEvent({
event: "MESSAGE_UPDATE",
channel_id,
data: message,
} as MessageUpdateEvent),
emitEvent({
event: "CHANNEL_PINS_UPDATE",
channel_id,
data: {
channel_id,
guild_id: channel.guild_id,
guild_id: message.guild_id,
last_pin_timestamp: undefined,
},
} as ChannelPinsUpdateEvent),

12
src/api/routes/guilds/#guild_id/widget.json.ts
View File

@ -17,9 +17,15 @@
*/
import { random, route } from "@spacebar/api";
import { Channel, Guild, Invite, Member, Permissions } from "@spacebar/util";
import {
Channel,
DiscordApiErrors,
Guild,
Invite,
Member,
Permissions,
} from "@spacebar/util";
import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
const router: Router = Router();
@ -48,7 +54,7 @@ router.get(
const { guild_id } = req.params;
const guild = await Guild.findOneOrFail({ where: { id: guild_id } });
if (!guild.widget_enabled) throw new HTTPError("Widget Disabled", 404);
if (!guild.widget_enabled) throw DiscordApiErrors.EMBED_DISABLED;
// Fetch existing widget invite for widget channel
let invite = await Invite.findOne({

14
src/api/routes/guilds/#guild_id/widget.png.ts
View File

@ -19,11 +19,12 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { route } from "@spacebar/api";
import { Guild } from "@spacebar/util";
import { DiscordApiErrors, Guild } from "@spacebar/util";
import { Request, Response, Router } from "express";
import fs from "fs";
import { HTTPError } from "lambert-server";
import path from "path";
import { storage } from "../../../../cdn/util/Storage";
const router: Router = Router();
@ -48,10 +49,10 @@ router.get(
const { guild_id } = req.params;
const guild = await Guild.findOneOrFail({ where: { id: guild_id } });
if (!guild.widget_enabled) throw new HTTPError("Unknown Guild", 404);
if (!guild.widget_enabled) throw DiscordApiErrors.EMBED_DISABLED;
// Fetch guild information
const icon = guild.icon;
const icon = "avatars/" + guild_id + "/" + guild.icon;
const name = guild.name;
const presence = guild.presence_count + " ONLINE";
@ -69,8 +70,7 @@ router.get(
}
// Setup canvas
const { createCanvas } = require("canvas");
const { loadImage } = require("canvas");
const { createCanvas, loadImage } = require("canvas");
const sizeOf = require("image-size");
// TODO: Widget style templates need Spacebar branding
@ -211,8 +211,8 @@ async function drawIcon(
scale: number,
icon: string,
) {
const img = new (require("canvas").Image)();
img.src = icon;
const { loadImage } = require("canvas");
const img = await loadImage(await storage.get(icon));
// Do some canvas clipping magic!
canvas.save();

4
src/api/routes/users/@me/index.ts
View File

@ -155,8 +155,8 @@ router.patch(
if (check_username.length > maxUsername) {
throw FieldErrors({
username: {
code: "USERNAME_INVALID",
message: `Username must be less than ${maxUsername} in length`,
code: "BASE_TYPE_BAD_LENGTH",
message: `Must be between 2 and ${maxUsername} in length.`,
},
});
}

2
src/gateway/opcodes/Identify.ts
View File

@ -82,6 +82,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
const identify: IdentifySchema = data.d;
this.capabilities = new Capabilities(identify.capabilities || 0);
this.large_threshold = identify.large_threshold || 250;
const user = await tryGetUserFromToken(identify.token, {
relations: ["relationships", "relationships.to", "settings"],
@ -126,6 +127,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
os: identify.properties?.os || identify.properties?.$os,
version: 0,
},
client_status: {},
activities: identify.presence?.activities, // TODO: validation
});

100
src/gateway/opcodes/RequestGuildMembers.ts
View File

@ -17,6 +17,7 @@
*/
import {
getDatabase,
getPermission,
GuildMembersChunkEvent,
Member,
@ -29,19 +30,24 @@ import { check } from "./instanceOf";
import { FindManyOptions, In, Like } from "typeorm";
export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
// TODO: check data
// Schema validation can only accept either string or array, so transforming it here to support both
if (!d.guild_id) throw new Error('"guild_id" is required');
d.guild_id = Array.isArray(d.guild_id) ? d.guild_id[0] : d.guild_id;
if (d.user_ids && !Array.isArray(d.user_ids)) d.user_ids = [d.user_ids];
check.call(this, RequestGuildMembersSchema, d);
const { guild_id, query, presences, nonce } =
d as RequestGuildMembersSchema;
let { limit, user_ids } = d as RequestGuildMembersSchema;
const { query, presences, nonce } = d as RequestGuildMembersSchema;
let { limit, user_ids, guild_id } = d as RequestGuildMembersSchema;
guild_id = guild_id as string;
user_ids = user_ids as string[] | undefined;
if ("query" in d && (!limit || Number.isNaN(limit)))
throw new Error('"query" requires "limit" to be set');
if ("query" in d && user_ids)
throw new Error('"query" and "user_ids" are mutually exclusive');
if (user_ids && !Array.isArray(user_ids)) user_ids = [user_ids];
user_ids = user_ids as string[] | undefined;
// TODO: Configurable limit?
if ((query || (user_ids && user_ids.length > 0)) && (!limit || limit > 100))
@ -50,24 +56,74 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
const permissions = await getPermission(this.user_id, guild_id);
permissions.hasThrow("VIEW_CHANNEL");
const whereQuery: FindManyOptions["where"] = {};
if (query) {
whereQuery.user = {
username: Like(query + "%"),
};
} else if (user_ids && user_ids.length > 0) {
whereQuery.id = In(user_ids);
}
const memberCount = await Member.count({
where: {
guild_id,
},
});
const memberFind: FindManyOptions = {
where: {
...whereQuery,
guild_id,
},
relations: ["user", "roles"],
};
if (limit) memberFind.take = Math.abs(Number(limit || 100));
const members = await Member.find(memberFind);
let members: Member[] = [];
if (memberCount > 75000) {
// since we dont have voice channels yet, just return the connecting users member object
members = await Member.find({
...memberFind,
where: {
...memberFind.where,
user: {
id: this.user_id,
},
},
});
} else if (memberCount > this.large_threshold) {
// find all members who are online, have a role, have a nickname, or are in a voice channel, as well as respecting the query and user_ids
const db = getDatabase();
if (!db) throw new Error("Database not initialized");
const repo = db.getRepository(Member);
const q = repo
.createQueryBuilder("member")
.where("member.guild_id = :guild_id", { guild_id })
.leftJoinAndSelect("member.roles", "role")
.leftJoinAndSelect("member.user", "user")
.leftJoinAndSelect("user.sessions", "session")
.andWhere(
"',' || member.roles || ',' NOT LIKE :everyoneRoleIdList",
{ everyoneRoleIdList: "%," + guild_id + ",%" },
)
.andWhere("session.status != 'offline'")
.addOrderBy("user.username", "ASC")
.limit(memberFind.take);
if (query && query != "") {
q.andWhere(`user.username ILIKE :query`, {
query: `${query}%`,
});
} else if (user_ids) {
q.andWhere(`user.id IN (:...user_ids)`, { user_ids });
}
members = await q.getMany();
} else {
if (query) {
// @ts-expect-error memberFind.where is very much defined
memberFind.where.user = {
username: Like(query + "%"),
};
} else if (user_ids && user_ids.length > 0) {
// @ts-expect-error memberFind.where is still very much defined
memberFind.where.id = In(user_ids);
}
members = await Member.find(memberFind);
}
const baseData = {
guild_id,
@ -111,7 +167,17 @@ export async function onRequestGuildMembers(this: WebSocket, { d }: Payload) {
});
}
if (notFound.length > 0) chunks[0].not_found = notFound;
if (notFound.length > 0) {
if (chunks.length == 0)
chunks.push({
...baseData,
members: [],
presences: presences ? [] : undefined,
chunk_index: 0,
chunk_count: 1,
});
chunks[0].not_found = notFound;
}
chunks.forEach((chunk) => {
Send(this, {

1
src/gateway/util/WebSocket.ts
View File

@ -43,4 +43,5 @@ export interface WebSocket extends WS {
listen_options: ListenEventOpts;
capabilities?: Capabilities;
// client?: Client;
large_threshold: number;
}

1
src/util/schemas/RegisterSchema.ts
View File

@ -19,7 +19,6 @@
export interface RegisterSchema {
/**
* @minLength 2
* @maxLength 32
*/
username: string;
/**

4
src/util/schemas/RequestGuildMembersSchema.ts
View File

@ -17,7 +17,7 @@
*/
export interface RequestGuildMembersSchema {
guild_id: string;
guild_id: string | [string];
query?: string;
limit?: number;
presences?: boolean;
@ -26,7 +26,7 @@ export interface RequestGuildMembersSchema {
}
export const RequestGuildMembersSchema = {
guild_id: String,
guild_id: "" as string | string[],
$query: String,
$limit: Number,
$presences: Boolean,

3
src/util/schemas/UserModifySchema.ts
View File

@ -18,8 +18,7 @@
export interface UserModifySchema {
/**
* @minLength 1
* @maxLength 100
* @minLength 2
*/
username?: string;
avatar?: string | null;

2
src/util/util/Constants.ts
View File

@ -812,7 +812,7 @@ export const DiscordApiErrors = {
"Cannot execute action on a DM channel",
50003,
),
EMBED_DISABLED: new ApiError("Guild widget disabled", 50004),
EMBED_DISABLED: new ApiError("Widget Disabled", 50004),
CANNOT_EDIT_MESSAGE_BY_OTHER: new ApiError(
"Cannot edit a message authored by another user",
50005,

BIN
src/webrtc/.DS_Store vendored
View File

Binary file not shown.