Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fosscord:master' into milestoneV1/routes/implement/emojis

Browse Source
This commit is contained in:
Lobo Metalúrgico 2021-10-09 23:44:59 -03:00 committed by GitHub
commit d359652b24
9 changed files with 94 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
api/client_test/index.html
View File

@ -5,6 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Discord Test Client</title> <title>Discord Test Client</title>
</head> </head>
<body> <body>
<div id="app-mount"></div> <div id="app-mount"></div>
<script> <script>
@ -46,12 +47,52 @@
); );
// Auto register guest account: // Auto register guest account:
const prefix = [
"mysterious",
"adventurous",
"courageous",
"precious",
"cynical",
"despicable",
"suspicious",
"gorgeous",
"lovely",
"stunning",
"based",
"keyed",
"ratioed",
"twink",
"phoned"
];
const suffix = [
"Anonymous",
"Lurker",
"User",
"Enjoyer",
"Hunk",
"Top",
"Bottom",
"Sub",
"Coolstar",
"Wrestling",
"TylerTheCreator",
"Ad"
];
Array.prototype.random = function () {
return this[Math.floor(Math.random() * this.length)];
};
function _generateName() {
return `${prefix.random()}${suffix.random()}`;
}
const token = JSON.parse(localStorage.getItem("token")); const token = JSON.parse(localStorage.getItem("token"));
if (!token && location.pathname !== "/login" && location.pathname !== "/register") { if (!token && location.pathname !== "/login" && location.pathname !== "/register") {
fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, { fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, {
method: "POST", method: "POST",
headers: { "content-type": "application/json" }, headers: { "content-type": "application/json" },
body: JSON.stringify({ username: "Anonymous", consent: true }) body: JSON.stringify({ username: `${_generateName()}`, consent: true }) //${Date.now().toString().slice(-4)}
}) })
.then((x) => x.json()) .then((x) => x.json())
.then((x) => { .then((x) => {
@ -62,6 +103,12 @@
} }
}); });
} }
const settings = JSON.parse(localStorage.getItem("UserSettingsStore"));
if (settings && settings.locale === "en") {
settings.locale = "en-US";
localStorage.setItem("UserSettingsStore", JSON.stringify(settings));
}
</script> </script>
<script src="/assets/479a2f1e7d625dc134b9.js"></script> <script src="/assets/479a2f1e7d625dc134b9.js"></script>
<script src="/assets/a15fd133a1d2d77a2424.js"></script> <script src="/assets/a15fd133a1d2d77a2424.js"></script>

8
api/src/routes/channels/#channel_id/messages/#message_id/ack.ts
View File

@ -1,4 +1,4 @@
import { emitEvent, getPermission, MessageAckEvent, ReadState } from "@fosscord/util"; import { emitEvent, getPermission, MessageAckEvent, ReadState, Snowflake } from "@fosscord/util";
import { Request, Response, Router } from "express"; import { Request, Response, Router } from "express";
import { route } from "@fosscord/api"; import { route } from "@fosscord/api";
@ -18,7 +18,11 @@ router.post("/", route({ body: "MessageAcknowledgeSchema" }), async (req: Reques
const permission = await getPermission(req.user_id, undefined, channel_id); const permission = await getPermission(req.user_id, undefined, channel_id);
permission.hasThrow("VIEW_CHANNEL"); permission.hasThrow("VIEW_CHANNEL");
await ReadState.update({ user_id: req.user_id, channel_id }, { user_id: req.user_id, channel_id, last_message_id: message_id }); let read_state = await ReadState.findOne({ user_id: req.user_id, channel_id });
if (!read_state) read_state = new ReadState({ user_id: req.user_id, channel_id });
read_state.last_message_id = message_id;
await read_state.save();
await emitEvent({ await emitEvent({
event: "MESSAGE_ACK", event: "MESSAGE_ACK",

5
api/src/routes/channels/#channel_id/messages/index.ts
View File

@ -103,6 +103,7 @@ router.get("/", async (req: Request, res: Response) => {
} }
const messages = await Message.find(query); const messages = await Message.find(query);
const endpoint = Config.get().cdn.endpointPublic;
return res.json( return res.json(
messages.map((x) => { messages.map((x) => {
@ -115,7 +116,9 @@ router.get("/", async (req: Request, res: Response) => {
// @ts-ignore // @ts-ignore
if (!x.author) x.author = { discriminator: "0000", username: "Deleted User", public_flags: "0", avatar: null }; if (!x.author) x.author = { discriminator: "0000", username: "Deleted User", public_flags: "0", avatar: null };
x.attachments?.forEach((x) => { x.attachments?.forEach((x) => {
x.proxy_url = `${Config.get().cdn.endpointPublic || "http://localhost:3003"}${new URL(x.proxy_url).pathname}`; // dynamically set attachment proxy_url in case the endpoint changed
const uri = x.proxy_url.startsWith("http") ? x.proxy_url : `https://example.org${x.proxy_url}`;
x.proxy_url = `${endpoint == null ? "http://localhost:3003" : endpoint}${new URL(uri).pathname}`;
}); });
return x; return x;

2
bundle/scripts/build.js
View File

@ -89,7 +89,7 @@ function walk(dir) {
var results = []; var results = [];
var list = fs.readdirSync(dir); var list = fs.readdirSync(dir);
list.forEach(function (file) { list.forEach(function (file) {
file = dir + "/" + file; file = path.join(dir, file);
var stat = fs.statSync(file); var stat = fs.statSync(file);
if (stat && stat.isDirectory()) { if (stat && stat.isDirectory()) {
/* Recurse into a subdirectory */ /* Recurse into a subdirectory */

3
bundle/src/Server.ts
View File

@ -30,9 +30,6 @@ async function main() {
cdn: { cdn: {
endpointClient: "${location.host}", endpointClient: "${location.host}",
endpointPrivate: `http://localhost:${port}`, endpointPrivate: `http://localhost:${port}`,
...(!Config.get().cdn.endpointPublic && {
endpointPublic: `http://localhost:${port}`,
}),
}, },
gateway: { gateway: {
endpointClient: endpointClient:

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

@ -11,6 +11,7 @@ import {
PublicMember, PublicMember,
PublicUser, PublicUser,
PrivateUserProjection, PrivateUserProjection,
ReadState,
} from "@fosscord/util"; } from "@fosscord/util";
import { Send } from "../util/Send"; import { Send } from "../util/Send";
import { CLOSECODES, OPCODES } from "../util/Constants"; import { CLOSECODES, OPCODES } from "../util/Constants";
@ -138,6 +139,13 @@ export async function onIdentify(this: WebSocket, data: Payload) {
//We save the session and we delete it when the websocket is closed //We save the session and we delete it when the websocket is closed
await session.save(); await session.save();
const read_states = await ReadState.find({ user_id: this.user_id });
read_states.forEach((s: any) => {
s.id = s.channel_id;
delete s.user_id;
delete s.channel_id;
});
const privateUser = { const privateUser = {
avatar: user.avatar, avatar: user.avatar,
mobile: user.mobile, mobile: user.mobile,
@ -176,8 +184,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
geo_ordered_rtc_regions: [], // TODO geo_ordered_rtc_regions: [], // TODO
relationships: user.relationships.map((x) => x.toPublicRelationship()), relationships: user.relationships.map((x) => x.toPublicRelationship()),
read_state: { read_state: {
// TODO entries: read_states,
entries: [],
partial: false, partial: false,
version: 304128, version: 304128,
}, },

13
util/src/entities/ReadState.ts
View File

@ -1,4 +1,4 @@
import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { Column, Entity, Index, JoinColumn, ManyToOne, RelationId } from "typeorm";
import { BaseClass } from "./BaseClass"; import { BaseClass } from "./BaseClass";
import { Channel } from "./Channel"; import { Channel } from "./Channel";
import { Message } from "./Message"; import { Message } from "./Message";
@ -9,8 +9,9 @@ import { User } from "./User";
// public read receipt ≥ notification cursor ≥ private fully read marker // public read receipt ≥ notification cursor ≥ private fully read marker
@Entity("read_states") @Entity("read_states")
@Index(["channel_id", "user_id"], { unique: true })
export class ReadState extends BaseClass { export class ReadState extends BaseClass {
@Column({ nullable: true }) @Column()
@RelationId((read_state: ReadState) => read_state.channel) @RelationId((read_state: ReadState) => read_state.channel)
channel_id: string; channel_id: string;
@ -20,7 +21,7 @@ export class ReadState extends BaseClass {
}) })
channel: Channel; channel: Channel;
@Column({ nullable: true }) @Column()
@RelationId((read_state: ReadState) => read_state.user) @RelationId((read_state: ReadState) => read_state.user)
user_id: string; user_id: string;
@ -35,15 +36,15 @@ export class ReadState extends BaseClass {
last_message_id: string; last_message_id: string;
@JoinColumn({ name: "last_message_id" }) @JoinColumn({ name: "last_message_id" })
@ManyToOne(() => Message) @ManyToOne(() => Message, { nullable: true })
last_message?: Message; last_message?: Message;
@Column({ nullable: true }) @Column({ nullable: true })
last_pin_timestamp?: Date; last_pin_timestamp?: Date;
@Column() @Column({ nullable: true })
mention_count: number; mention_count: number;
@Column() @Column({ nullable: true })
manual: boolean; manual: boolean;
} }

1
util/src/util/Config.ts
View File

@ -12,7 +12,6 @@ export const Config = {
if (config) return config; if (config) return config;
pairs = await ConfigEntity.find(); pairs = await ConfigEntity.find();
config = pairsToConfig(pairs); config = pairsToConfig(pairs);
console.log(config.guild.autoJoin);
return this.set((config || {}).merge(DefaultConfigOptions)); return this.set((config || {}).merge(DefaultConfigOptions));
}, },

23
util/src/util/cdn.ts
View File

@ -25,15 +25,30 @@ export async function uploadFile(path: string, file: Express.Multer.File) {
return result; return result;
} }
export async function handleFile(path: string, body?: string): Promise<string | undefined> { export async function handleFile(
if (!body || !body.startsWith("data:")) return body; path: string,
body?: string
): Promise<
| (string & {
id: string;
content_type: string;
size: number;
url: string;
})
| undefined
> {
if (!body || !body.startsWith("data:")) return undefined;
try { try {
const mimetype = body.split(":")[1].split(";")[0]; const mimetype = body.split(":")[1].split(";")[0];
const buffer = Buffer.from(body.split(",")[1], "base64"); const buffer = Buffer.from(body.split(",")[1], "base64");
// @ts-ignore // @ts-ignore
const { id } = await uploadFile(path, { buffer, mimetype, originalname: "banner" }); const file = await uploadFile(path, { buffer, mimetype, originalname: "banner" });
return id; const obj = file.id;
for (const key in file) {
obj[key] = file[key];
}
return obj;
} catch (error) { } catch (error) {
console.error(error); console.error(error);
throw new HTTPError("Invalid " + path); throw new HTTPError("Invalid " + path);