dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-08-27 22:34:11 +00:00
Code Issues 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
parent 5c4774a6f9 484758b317
commit d359652b24
9 changed files with 94 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client_test/index.html
+48 -1
View File
@@ -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>
api/src/routes/channels/#channel_id/messages/#message_id/ack.ts
+6 -2
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 { 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",
api/src/routes/channels/#channel_id/messages/index.ts
+4 -1
View File
@@ -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;