summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/client_test/index.html49
-rw-r--r--api/src/routes/channels/#channel_id/messages/#message_id/ack.ts8
-rw-r--r--api/src/routes/channels/#channel_id/messages/index.ts5
-rw-r--r--bundle/scripts/build.js2
-rw-r--r--bundle/src/Server.ts3
-rw-r--r--gateway/src/opcodes/Identify.ts11
-rw-r--r--util/src/entities/ReadState.ts13
-rw-r--r--util/src/util/Config.ts1
-rw-r--r--util/src/util/cdn.ts23
9 files changed, 94 insertions, 21 deletions
diff --git a/api/client_test/index.html b/api/client_test/index.html
index 41d41598..20b431b8 100644
--- a/api/client_test/index.html
+++ b/api/client_test/index.html
@@ -5,6 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<title>Discord Test Client</title>
 	</head>
+
 	<body>
 		<div id="app-mount"></div>
 		<script>
@@ -46,12 +47,52 @@
 			);
 
 			// 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"));
 			if (!token && location.pathname !== "/login" && location.pathname !== "/register") {
 				fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, {
 					method: "POST",
 					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) => {
@@ -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 src="/assets/479a2f1e7d625dc134b9.js"></script>
 		<script src="/assets/a15fd133a1d2d77a2424.js"></script>
diff --git a/api/src/routes/channels/#channel_id/messages/#message_id/ack.ts b/api/src/routes/channels/#channel_id/messages/#message_id/ack.ts
index 786e4581..208c1da4 100644
--- a/api/src/routes/channels/#channel_id/messages/#message_id/ack.ts
+++ b/api/src/routes/channels/#channel_id/messages/#message_id/ack.ts
@@ -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 { 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);
 	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({
 		event: "MESSAGE_ACK",
diff --git a/api/src/routes/channels/#channel_id/messages/index.ts b/api/src/routes/channels/#channel_id/messages/index.ts
index 1f856b80..4ec31417 100644
--- a/api/src/routes/channels/#channel_id/messages/index.ts
+++ b/api/src/routes/channels/#channel_id/messages/index.ts
@@ -103,6 +103,7 @@ router.get("/", async (req: Request, res: Response) => {
 	}
 
 	const messages = await Message.find(query);
+	const endpoint = Config.get().cdn.endpointPublic;
 
 	return res.json(
 		messages.map((x) => {
@@ -115,7 +116,9 @@ router.get("/", async (req: Request, res: Response) => {
 			// @ts-ignore
 			if (!x.author) x.author = { discriminator: "0000", username: "Deleted User", public_flags: "0", avatar: null };
 			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;
diff --git a/bundle/scripts/build.js b/bundle/scripts/build.js
index 05cf37ce..4266942f 100644
--- a/bundle/scripts/build.js
+++ b/bundle/scripts/build.js
@@ -89,7 +89,7 @@ function walk(dir) {
 	var results = [];
 	var list = fs.readdirSync(dir);
 	list.forEach(function (file) {
-		file = dir + "/" + file;
+		file = path.join(dir, file);
 		var stat = fs.statSync(file);
 		if (stat && stat.isDirectory()) {
 			/* Recurse into a subdirectory */
diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts
index 662b9008..5dda2d02 100644
--- a/bundle/src/Server.ts
+++ b/bundle/src/Server.ts
@@ -30,9 +30,6 @@ async function main() {
 		cdn: {
 			endpointClient: "${location.host}",
 			endpointPrivate: `http://localhost:${port}`,
-			...(!Config.get().cdn.endpointPublic && {
-				endpointPublic: `http://localhost:${port}`,
-			}),
 		},
 		gateway: {
 			endpointClient:
diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts
index 6decf21c..b81c7bf4 100644
--- a/gateway/src/opcodes/Identify.ts
+++ b/gateway/src/opcodes/Identify.ts
@@ -11,6 +11,7 @@ import {
 	PublicMember,
 	PublicUser,
 	PrivateUserProjection,
+	ReadState,
 } from "@fosscord/util";
 import { Send } from "../util/Send";
 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
 	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 = {
 		avatar: user.avatar,
 		mobile: user.mobile,
@@ -176,8 +184,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 		geo_ordered_rtc_regions: [], // TODO
 		relationships: user.relationships.map((x) => x.toPublicRelationship()),
 		read_state: {
-			// TODO
-			entries: [],
+			entries: read_states,
 			partial: false,
 			version: 304128,
 		},
diff --git a/util/src/entities/ReadState.ts b/util/src/entities/ReadState.ts
index 68e867a0..89480e83 100644
--- a/util/src/entities/ReadState.ts
+++ b/util/src/entities/ReadState.ts
@@ -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 { Channel } from "./Channel";
 import { Message } from "./Message";
@@ -9,8 +9,9 @@ import { User } from "./User";
 // public read receipt ≥ notification cursor ≥ private fully read marker
 
 @Entity("read_states")
+@Index(["channel_id", "user_id"], { unique: true })
 export class ReadState extends BaseClass {
-	@Column({ nullable: true })
+	@Column()
 	@RelationId((read_state: ReadState) => read_state.channel)
 	channel_id: string;
 
@@ -20,7 +21,7 @@ export class ReadState extends BaseClass {
 	})
 	channel: Channel;
 
-	@Column({ nullable: true })
+	@Column()
 	@RelationId((read_state: ReadState) => read_state.user)
 	user_id: string;
 
@@ -35,15 +36,15 @@ export class ReadState extends BaseClass {
 	last_message_id: string;
 
 	@JoinColumn({ name: "last_message_id" })
-	@ManyToOne(() => Message)
+	@ManyToOne(() => Message, { nullable: true })
 	last_message?: Message;
 
 	@Column({ nullable: true })
 	last_pin_timestamp?: Date;
 
-	@Column()
+	@Column({ nullable: true })
 	mention_count: number;
 
-	@Column()
+	@Column({ nullable: true })
 	manual: boolean;
 }
diff --git a/util/src/util/Config.ts b/util/src/util/Config.ts
index eeeaa2ce..704f3f2f 100644
--- a/util/src/util/Config.ts
+++ b/util/src/util/Config.ts
@@ -12,7 +12,6 @@ export const Config = {
 		if (config) return config;
 		pairs = await ConfigEntity.find();
 		config = pairsToConfig(pairs);
-		console.log(config.guild.autoJoin);
 
 		return this.set((config || {}).merge(DefaultConfigOptions));
 	},
diff --git a/util/src/util/cdn.ts b/util/src/util/cdn.ts
index 2de23f5d..8d45f85f 100644
--- a/util/src/util/cdn.ts
+++ b/util/src/util/cdn.ts
@@ -25,15 +25,30 @@ export async function uploadFile(path: string, file: Express.Multer.File) {
 	return result;
 }
 
-export async function handleFile(path: string, body?: string): Promise<string | undefined> {
-	if (!body || !body.startsWith("data:")) return body;
+export async function handleFile(
+	path: string,
+	body?: string
+): Promise<
+	| (string & {
+			id: string;
+			content_type: string;
+			size: number;
+			url: string;
+	  })
+	| undefined
+> {
+	if (!body || !body.startsWith("data:")) return undefined;
 	try {
 		const mimetype = body.split(":")[1].split(";")[0];
 		const buffer = Buffer.from(body.split(",")[1], "base64");
 
 		// @ts-ignore
-		const { id } = await uploadFile(path, { buffer, mimetype, originalname: "banner" });
-		return id;
+		const file = await uploadFile(path, { buffer, mimetype, originalname: "banner" });
+		const obj = file.id;
+		for (const key in file) {
+			obj[key] = file[key];
+		}
+		return obj;
 	} catch (error) {
 		console.error(error);
 		throw new HTTPError("Invalid " + path);
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-10 07:24:54 +0000