dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-06-25 12:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cloud attachments (dont circular import in cdn)

Browse Source
This commit is contained in:
Rory&
2026-06-18 09:04:53 +02:00
parent 1612bb0d12
commit 18dd02f151
20 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extra/admin-api/Tests/Spacebar.Tests/Tests/MessageTests.cs
+38 -30
View File
@@ -92,7 +92,7 @@ public class MessageTests(ITestOutputHelper testOutputHelper, TestFixture fixtur
var res = await Assert.HttpSuccess(await Client.ApiHttpClient.PostAsync($"channels/{Channel.Id}/messages", content,
cancellationToken: TestContext.Current.CancellationToken));
var json = (await res.Content.ReadFromJsonAsync<JsonObject>());
var json = (await res.Content.ReadFromJsonAsync<JsonObject>(cancellationToken: TestContext.Current.CancellationToken));
testOutputHelper.WriteLine(json.ToJson(indent: true));
var msg = json.Deserialize<Message>();
Assert.Equal("meow", msg.Content);
@@ -109,33 +109,40 @@ public class MessageTests(ITestOutputHelper testOutputHelper, TestFixture fixtur
}
]
}, cancellationToken: TestContext.Current.CancellationToken));
var createAttRespContent = await createAttResp.Content.ReadFromJsonAsync<JsonObject>();
testOutputHelper.WriteLine(createAttRespContent.ToString());
var createAttRespContent = await createAttResp.Content.ReadFromJsonAsync<JsonObject>(cancellationToken: TestContext.Current.CancellationToken);
testOutputHelper.WriteLine(createAttRespContent?.ToString());
var createAtt = createAttRespContent.Deserialize<CreateAttachmentResponse>();
foreach (var attFile in createAtt.Attachments) {
var ret = await Assert.HttpSuccess(await Client.ApiHttpClient.PutAsync(attFile.UploadUrl,
new ByteArrayContent("Hellorld!"u8.ToArray()) {
Headers = {
ContentType = new MediaTypeHeaderValue("text/plain")
}
}));
var retCon = await ret.Content.ReadFromJsonAsync<JsonObject>();
testOutputHelper.WriteLine(retCon.ToString());
}
foreach (var attFile in createAtt.Attachments)
await Assert.HttpSuccess(await Client.ApiHttpClient.PutAsync(attFile.UploadUrl, new ByteArrayContent("Hellorld!"u8.ToArray()) {
Headers = {
ContentType = new MediaTypeHeaderValue("text/plain")
}
}, TestContext.Current.CancellationToken));
// var res = await Assert.HttpSuccess(await Client.ApiHttpClient.PostAsync($"channels/{Channel.Id}/messages", content,
// cancellationToken: TestContext.Current.CancellationToken));
// var json = (await res.Content.ReadFromJsonAsync<JsonObject>());
// testOutputHelper.WriteLine(json.ToJson(indent: true));
// var msg = json.Deserialize<Message>();
// Assert.Equal("meow", msg.Content);
var content = new JsonObject() {
{ "content", "meow" }, {
"attachments", new JsonArray() {
new JsonObject() {
{ "id", createAtt.Attachments[0].Id.ToString() },
{ "filename", "hellorld.txt" },
{ "uploaded_filename", createAtt.Attachments[0].UploadFileName },
{ "original_content_type", "text/plain" },
}
}
}
};
var res = await Assert.HttpSuccess(await Client.ApiHttpClient.PostAsJsonAsync($"channels/{Channel.Id}/messages", content,
cancellationToken: TestContext.Current.CancellationToken));
var json = (await res.Content.ReadFromJsonAsync<JsonObject>());
testOutputHelper.WriteLine(json.ToJson(indent: true));
var msg = json.Deserialize<Message>();
Assert.Equal("meow", msg.Content);
Assert.Single(msg.Attachments);
}
public static IEnumerable<object?[]> WebhookExecuteCombinations() {
string[] contents = ["meow", "meowmeow", "emma was here", "# hi!!!", "https://spacebar.chat/favicon.ico", "@everyone", "@here"];
string?[] usernames = [null, "meow"];
string?[] avatarUrls = [null, "https://spacebar.chat/favicon.ico"];
string[] contents = ["meow", "# hi!!!", "https://spacebar.chat/favicon.ico", "@everyone", "@here"];
bool?[] ttsEnabled = [null, true, false];
int?[] messageFlags = [
null,
@@ -145,32 +152,33 @@ public class MessageTests(ITestOutputHelper testOutputHelper, TestFixture fixtur
1 << 13 // VOICE_MESSAGE
];
var i = 0;
foreach (var content in contents)
// foreach (var avatarUrl in avatarUrls)
foreach (var tts in ttsEnabled)
foreach (var flags in messageFlags)
foreach (var withNonce in (bool[])[true, false])
yield return [content, null /*avatarUrl*/, tts, flags, withNonce ? Guid.NewGuid().ToString() : null];
foreach (var flags in messageFlags) {
yield return [content, tts, flags, null];
if (i++ % 50 == 0) yield return [content, tts, flags, Guid.NewGuid().ToString()];
}
}
[Theory]
[MemberData(nameof(WebhookExecuteCombinations))]
public async Task SendWebhookMessageWithData(string content, string? avatarUrl, bool? tts, int? flags, string? nonce) {
public async Task SendWebhookMessageWithData(string content, bool? tts, int? flags, string? nonce) {
var payload = new JsonObject() {
{ "content", content }
};
if (avatarUrl != null) payload.Add("avatar_url", avatarUrl);
// BUG: figure out why this endpoint even accepts avatar_url in the first place...?
if (tts != null) payload.Add("tts", tts);
if (flags != null) payload.Add("flags", flags);
if (nonce != null) payload.Add("nonce", nonce);
var reqContent = new MultipartFormDataContent();
reqContent.Add(JsonContent.Create(payload), "payload_json");
testOutputHelper.WriteLine(await reqContent.ReadAsStringAsync());
testOutputHelper.WriteLine(await reqContent.ReadAsStringAsync(TestContext.Current.CancellationToken));
var res = await Assert.HttpSuccess(await Client.ApiHttpClient.PostAsync($"channels/{Channel.Id}/messages", reqContent,
cancellationToken: TestContext.Current.CancellationToken));
var json = (await res.Content.ReadFromJsonAsync<JsonObject>());
var json = (await res.Content.ReadFromJsonAsync<JsonObject>(cancellationToken: TestContext.Current.CancellationToken));
testOutputHelper.WriteLine(json.ToJson(indent: true));
var msg = json.Deserialize<Message>();
Assert.Equal(content, msg.Content);
extra/admin-api/Tests/Spacebar.Tests/Tests/WebhookTests.cs
+1 -1
View File
@@ -119,7 +119,7 @@ public class WebhookTests(ITestOutputHelper testOutputHelper, TestFixture fixtur
}
public static IEnumerable<object?[]> WebhookExecuteCombinations() {
string[] contents = ["meow", "meowmeow", "emma was here", "# hi!!!", "https://spacebar.chat/favicon.ico", "@everyone", "@here"];
string[] contents = ["meow", "# hi!!!", "https://spacebar.chat/favicon.ico", "@everyone", "@here"];
string?[] usernames = [null, "meow"];
string?[] avatarUrls = [null, "https://spacebar.chat/favicon.ico"];
bool?[] ttsEnabled = [null, true, false];
src/cdn/routes/app-assets.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/app-icons.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/attachments.ts
+1 -1
View File
@@ -22,7 +22,7 @@ import imageSize from "image-size";
import { HTTPError } from "lambert-server/HTTPError";
import { CloudAttachment } from "@spacebar/database";
import { Config, hasValidSignature, NewUrlUserSignatureData, Snowflake, UrlSignResult } from "@spacebar/util";
import { storage, multer, cache } from "@spacebar/cdn/util";
import { storage, multer, cache } from "../util";
const router = Router({ mergeParams: true });
src/cdn/routes/avatar-decoration-presets.ts
+1 -1
View File
@@ -19,7 +19,7 @@
import { Router, Response, Request } from "express";
import { HTTPError } from "lambert-server/HTTPError";
import { fileTypeFromBuffer } from "file-type";
import { storage, cache } from "@spacebar/cdn/util";
import { storage, cache } from "../util";
const router = Router({ mergeParams: true });
src/cdn/routes/avatars.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { Config } from "@spacebar/util";
import { HTTPError } from "lambert-server/HTTPError";
import { storage, multer, cache } from "@spacebar/cdn/util";
import { storage, multer, cache } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/badge-icons.ts
+1 -1
View File
@@ -19,7 +19,7 @@
import { Router, Response, Request } from "express";
import { HTTPError } from "lambert-server/HTTPError";
import { fileTypeFromBuffer } from "file-type";
import { storage, cache } from "@spacebar/cdn/util";
import { storage, cache } from "../util";
const router = Router({ mergeParams: true });
src/cdn/routes/banners.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/channel-icons.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/discover-splashes.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/discovery-splashes.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/embed.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { join } from "node:path";
import { Request, Response, Router } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { cache } from "@spacebar/cdn/util";
import { cache } from "../util";
const defaultAvatarHashMap = new Map([
["0", "4a8562cf00887030c416d3ec2d46385a"],
src/cdn/routes/emojis.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/guild-profiles.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Request, Response, Router } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache } from "@spacebar/cdn/util";
import { storage, multer, cache } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/icons.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/role-icons.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache } from "@spacebar/cdn/util";
import { storage, multer, cache } from "../util";
//Role icons ---> avatars.ts modified
src/cdn/routes/splashes.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import crypto from "node:crypto";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/stickers.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon
src/cdn/routes/team-icons.ts
+1 -1
View File
@@ -21,7 +21,7 @@ import { Router, Response, Request } from "express";
import { fileTypeFromBuffer } from "file-type";
import { HTTPError } from "lambert-server/HTTPError";
import { Config } from "@spacebar/util";
import { storage, multer, cache, cacheNotFound } from "@spacebar/cdn/util";
import { storage, multer, cache, cacheNotFound } from "../util";
// TODO: check premium and animated pfp are allowed in the config
// TODO: generate different sizes of icon